From: jpr <jpr>
Date: Fri, 31 Oct 2003 14:59:50 +0000 (+0000)
Subject: removal of useless jBitsInJsample.h for both 8 and 12 Bits JPEG Libraries
X-Git-Tag: Version0.3.1~60
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=480c944ba4a88fd4011a489feea7bcfc6051a7ac;p=gdcm.git

removal of useless jBitsInJsample.h for both 8 and 12 Bits JPEG Libraries
---

diff --git a/src/jpeg/libijg/jmorecfg.h b/src/jpeg/libijg/jmorecfg.h
index 43de73fa..dd0f188d 100644
--- a/src/jpeg/libijg/jmorecfg.h
+++ b/src/jpeg/libijg/jmorecfg.h
@@ -19,8 +19,7 @@
  * We do not support run-time selection of data precision, sorry.
  */
 
-//#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
-#include "jBitsInJsample.h" 
+#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
 
 /*
  * Maximum number of components (color channels) allowed in JPEG image.
diff --git a/src/jpeg/libijg12/jBitsInJsample12.h b/src/jpeg/libijg12/jBitsInJsample12.h
deleted file mode 100644
index 6f494f7e..00000000
--- a/src/jpeg/libijg12/jBitsInJsample12.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define BITS_IN_JSAMPLE  12	/* use 8 or 12 */
-
-// to be used from dcmlib.
-// to be removed when both jpeg8 bits and jpeg12 bits are usable
\ No newline at end of file
diff --git a/src/jpeg/libijg8/jBitsInJsample.h b/src/jpeg/libijg8/jBitsInJsample.h
deleted file mode 100644
index 86d7fc38..00000000
--- a/src/jpeg/libijg8/jBitsInJsample.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
-
-// to be used from dcmlib.
-// to be removed when both jpeg8 bits and jpeg12 bits are usable
-  
- 
-
diff --git a/src/jpeg/libijg8/jmorecfg.h b/src/jpeg/libijg8/jmorecfg.h
index 43de73fa..dd0f188d 100644
--- a/src/jpeg/libijg8/jmorecfg.h
+++ b/src/jpeg/libijg8/jmorecfg.h
@@ -19,8 +19,7 @@
  * We do not support run-time selection of data precision, sorry.
  */
 
-//#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
-#include "jBitsInJsample.h" 
+#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
 
 /*
  * Maximum number of components (color channels) allowed in JPEG image.