avoid segfault when unaware user sets SplitOnly to true, and the asks for ImageDataVector

[gdcm.git] / src / gdcmjpeg / CMakeLists.txt

diff --git a/src/gdcmjpeg/CMakeLists.txt b/src/gdcmjpeg/CMakeLists.txt
index 43a5f2751408a01a23b48c560ebe5d408687760e..8a0641cfb0be91deba59ad8c73fa2678b4d17ac4 100644 (file)
--- a/src/gdcmjpeg/CMakeLists.txt
+++ b/src/gdcmjpeg/CMakeLists.txt
@@ -43,7 +43,7 @@ jdapimin.c jdapistd.c jdtrans.c  jdmaster.c
 jdinput.c jdmarker.c jdhuff.c jdphuff.c jdmainct.c jdcoefct.c
 jdpostct.c jddctmgr.c jidctfst.c jidctflt.c jidctint.c jidctred.c
 jdsample.c jdcolor.c jquant1.c jquant2.c jdmerge.c
-jdatasrc.c jmemsrc.c
+jdatasrc.c
 )
 
 SET(decomp_lossy_SRCS
@@ -86,12 +86,18 @@ ENDFOREACH(src)
 
 IF (WIN32)
   IF (BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DJPEGDLL)
+    #ADD_DEFINITIONS(-DJPEGDLL)
+    SET(JPEGDLL 1)
   ELSE (BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DJPEGSTATIC)
+    #ADD_DEFINITIONS(-DJPEGSTATIC)
+    SET(JPEGSTATIC 1)
   ENDIF (BUILD_SHARED_LIBS)
 ENDIF (WIN32)
 
+# By default support DICOMObjects bug, if this is a speed penalty for you
+# you should consider disabling it
+SET(SUPPORT_DICOMOBJECTS_BUG ON)
+
 CONFIGURE_FILE(${GDCMJPEG_SOURCE_DIR}/.NoDartCoverage
                ${GDCMJPEG_BINARY_DIR}/.NoDartCoverage)