jBitsInJsample.h : to avoid pb when including in gdcmJpeg.cxx

diff --git a/src/jpeg/libijg/jconfig.h b/src/jpeg/libijg/jconfig.h
index a0d3a360acd0a9e95d02828bc3297e9f5b9f9849..fc0d3d89e0a044bcdeac55cb98c04ea27428cb01 100644 (file)
--- a/src/jpeg/libijg/jconfig.h
+++ b/src/jpeg/libijg/jconfig.h
@@ -3,4 +3,5 @@
 #endif
 #ifdef __GNUC__
    #include "jconfig.linux"
-#endif
\ No newline at end of file
+#endif
+

diff --git a/src/jpeg/libijg/jmorecfg.h b/src/jpeg/libijg/jmorecfg.h
index d10fb8f1d080c6b3414a0eaff1f942f28fe88301..43de73fa52fa8b899d4a8dce6281f53bb2dc49e6 100644 (file)
--- a/src/jpeg/libijg/jmorecfg.h
+++ b/src/jpeg/libijg/jmorecfg.h
@@ -10,7 +10,6 @@
  * optimizations.  Most users will not need to touch this file.
  */
 
-
 /*
  * Define BITS_IN_JSAMPLE as either
  *   8   for 8-bit sample values (the usual setting)
@@ -20,8 +19,8 @@
  * We do not support run-time selection of data precision, sorry.
  */
 
-#define BITS_IN_JSAMPLE  12    /* use 8 or 12 */
-
+//#define BITS_IN_JSAMPLE  8   /* use 8 or 12 */
+#include "jBitsInJsample.h" 
 
 /*
  * Maximum number of components (color channels) allowed in JPEG image.

diff --git a/src/jpeg/libijg8/Makefile.am b/src/jpeg/libijg8/Makefile.am
index 757b0ff704ada70030038ed2fbe8f4bf37d2956c..55aff48069fa7503fa53abf2a9eeb9fab0e7a25f 100644 (file)
--- a/src/jpeg/libijg8/Makefile.am
+++ b/src/jpeg/libijg8/Makefile.am
@@ -50,7 +50,8 @@ libgdcmijpeg8_la_SOURCES=             \
        jutils.c \
        jerror.c \
        jmemmgr.c \
-       jmemnobs.c
+       jmemnobs.c \
+       rdrle.c
 
 libgdcmijpeg8includedir = $(includedir)
 libgdcmijpeg8include_HEADERS = \
@@ -64,7 +65,7 @@ libgdcmijpeg8include_HEADERS = \
        jmorecfg.h  \
        jpegint.h  \
        jpeglib.h  \
-       jversion.h
+       jversion.h 
 
 EXTRA_DIST = \
    jconfig.linux \

diff --git a/src/jpeg/libijg8/jBitsInJsample.h b/src/jpeg/libijg8/jBitsInJsample.h
new file mode 100644 (file)
index 0000000..86d7fc3
--- /dev/null
+++ b/src/jpeg/libijg8/jBitsInJsample.h
@@ -0,0 +1,7 @@
+#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/jconfig.h b/src/jpeg/libijg8/jconfig.h
index a0d3a360acd0a9e95d02828bc3297e9f5b9f9849..fc0d3d89e0a044bcdeac55cb98c04ea27428cb01 100644 (file)
--- a/src/jpeg/libijg8/jconfig.h
+++ b/src/jpeg/libijg8/jconfig.h
@@ -3,4 +3,5 @@
 #endif
 #ifdef __GNUC__
    #include "jconfig.linux"
-#endif
\ No newline at end of file
+#endif
+

diff --git a/src/jpeg/libijg8/jmorecfg.h b/src/jpeg/libijg8/jmorecfg.h
index d10fb8f1d080c6b3414a0eaff1f942f28fe88301..43de73fa52fa8b899d4a8dce6281f53bb2dc49e6 100644 (file)
--- a/src/jpeg/libijg8/jmorecfg.h
+++ b/src/jpeg/libijg8/jmorecfg.h
@@ -10,7 +10,6 @@
  * optimizations.  Most users will not need to touch this file.
  */
 
-
 /*
  * Define BITS_IN_JSAMPLE as either
  *   8   for 8-bit sample values (the usual setting)
@@ -20,8 +19,8 @@
  * We do not support run-time selection of data precision, sorry.
  */
 
-#define BITS_IN_JSAMPLE  12    /* use 8 or 12 */
-
+//#define BITS_IN_JSAMPLE  8   /* use 8 or 12 */
+#include "jBitsInJsample.h" 
 
 /*
  * Maximum number of components (color channels) allowed in JPEG image.