ENH: Finally modify gdcm source to adapt to new jpeg lib, this is not perfect but...

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc0272297983320c358c4a9e67340cbb6f535478..d3dbfdf72f915f80158b727ac2cff4064d64cf4b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,10 +4,10 @@ SUBDIRS(jpeg)
 
 # "jpeglib.h" is defined here:
 INCLUDE_DIRECTORIES(
-  ${GDCM_SOURCE_DIR}/src/jpeg/libijg8
-  #${GDCM_SOURCE_DIR}/jpeg/libijg12 #all files have been renamed, appending 12
-  #${GDCM_SOURCE_DIR}/jpeg/ljpg     # JPEG lib from xmedcom 
+  ${GDCM_SOURCE_DIR}/
   ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h
+#  ${GDCM_BINARY_DIR}/src/jpeg/libijg8  #created a build time
+#  ${GDCM_BINARY_DIR}/src/jpeg/libijg12 #created a build time
 )
 
 SET(libgdcm_la_SOURCES

diff --git a/src/gdcmJpeg.cxx b/src/gdcmJpeg.cxx
index d632432f97c200fb6dd428c82383e7ea76f1c8d8..28d0acd17cfabbf2d39082d4363c28a28629fbfd 100644 (file)
--- a/src/gdcmJpeg.cxx
+++ b/src/gdcmJpeg.cxx
@@ -77,7 +77,10 @@ of the uncompressed pixel data from which the compressed data is derived
  */
 
 extern "C" {
-#include "jpeglib.h"
+//#include "jpeglib.h"
+#include "src/jpeg/libijg8/jconfig.h"
+#include "src/jpeg/libijg8/jpeglib.h"
+
 #include <setjmp.h>
 }
 

diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx
index 4a00622ac6f6f5bd82d7ad52c7470a3a5eec289b..fe30bbb9f1218edb89ea98d72bf0d055a534e541 100644 (file)
--- a/src/gdcmJpeg12.cxx
+++ b/src/gdcmJpeg12.cxx
@@ -9,72 +9,6 @@
 #define GDCM_jpr_DEBUG 0
 #endif   //GDCM_DEBUG
 
-// BITS_IN_JSAMPLE is a compile time defined options.
-// We need both 8 an 12;
-// To avoid renaming *all* the Jpeg functions,
-// we hard code the 'brain damaged liker' option.
-// For all the functions, we shall have the 8 and 12 version
-// (8 with the 'long' name, 12 with the 'short' name)
-
-#define jpeg_read_header        jReadHeader
-#define my_error_exit           myErrorExit
-#define jpeg_destroy_decompress jDestDecompress
-#define jpeg_stdio_src          jStdSrc
-#define jpeg_read_header        jReadHeader
-#define jpeg_read_scanlines     jReadScanlines
-#define jpeg_finish_decompress  jFinDecompress
-//#define jpeg_create_decompress  jCreaDecompress //FIXME
-
-// -----------------
-#define jpeg_std_error           jStdError
-#define jpeg_CreateCompress      jCreaCompress
-#define jpeg_CreateDecompress    jCreaDecompress
-#define jpeg_destroy_compress    jDestCompress
-#define jpeg_destroy_decompress  jDestDecompress
-#define jpeg_stdio_dest          jStdDest
-#define jpeg_stdio_src           jStdSrc
-#define jpeg_set_defaults        jSetDefaults
-#define jpeg_set_colorspace      jSetColorspace
-#define jpeg_default_colorspace  jDefColorspace
-#define jpeg_set_quality         jSetQuality
-#define jpeg_set_linear_quality  jSetLQuality
-#define jpeg_add_quant_table     jAddQuantTable
-#define jpeg_quality_scaling     jQualityScaling
-#define jpeg_simple_progression  jSimProgress
-#define jpeg_suppress_tables     jSuppressTables
-#define jpeg_alloc_quant_table   jAlcQTable
-#define jpeg_alloc_huff_table    jAlcHTable
-#define jpeg_start_compress      jStrtCompress
-#define jpeg_write_scanlines     jWrtScanlines
-#define jpeg_finish_compress     jFinCompress
-#define jpeg_write_raw_data      jWrtRawData
-#define jpeg_write_marker        jWrtMarker
-#define jpeg_write_m_header      jWrtMHeader
-#define jpeg_write_m_byte        jWrtMByte
-#define jpeg_write_tables        jWrtTables
-#define jpeg_read_header         jReadHeader
-#define jpeg_start_decompress    jStrtDecompress
-#define jpeg_read_scanlines      jReadScanlines
-#define jpeg_finish_decompress   jFinDecompress
-#define jpeg_read_raw_data       jReadRawData
-#define jpeg_has_multiple_scans  jHasMultScn
-#define jpeg_start_output        jStrtOutput
-#define jpeg_finish_output       jFinOutput
-#define jpeg_input_complete      jInComplete
-#define jpeg_new_colormap        jNewCMap
-#define jpeg_consume_input          jConsumeInput
-#define jpeg_calc_output_dimensions jCalcDimensions
-#define jpeg_save_markers           jSaveMarkers
-#define jpeg_set_marker_processor   jSetMarker
-#define jpeg_read_coefficients      jReadCoefs
-#define jpeg_write_coefficients     jWrtCoefs
-#define jpeg_copy_critical_parameters jCopyCrit
-#define jpeg_abort_compress      jAbrtCompress
-#define jpeg_abort_decompress    jAbrtDecompress
-#define jpeg_abort               jAbort
-#define jpeg_destroy             jDestroy
-#define jpeg_resync_to_restart   jResyncRestart
-
 /*
  * <setjmp.h> is used for the optional error recovery mechanism shown in
  * the second part of the example.
@@ -89,7 +23,9 @@
  */
 
 extern "C" {
-#include "jpeg/libijg12/jpeglib12.h"
+#include "src/jpeg/libijg12/jconfig.h"
+#include "src/jpeg/libijg12/jpeglib.h"
+//#include "jconfig12.h"
 #include <setjmp.h>
 }
 /******************** JPEG COMPRESSION SAMPLE INTERFACE *******************/