Makefile.am,CMakeLists.txt updated to deal with the new library

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 97b8086ffa129b6882a74f081fa06e1b3441fecd..43e70ff9729c1b5e90ca56eb9a4a23e56cd46b82 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,8 @@ SUBDIRS(jpeg)
 INCLUDE_DIRECTORIES(\r
   ${GDCM_SOURCE_DIR}/jpeg/libijg8\r
   #${GDCM_SOURCE_DIR}/jpeg/libijg12 #all files have been renamed, appending 12\r
+  #${GDCM_SOURCE_DIR}/jpeg/ljpg     # JPEG lib from xmedcom \r
+                                    #\r
 )\r
 \r
 SET(libgdcm_la_SOURCES\r
@@ -27,7 +29,7 @@ SET(libgdcm_la_SOURCES
        gdcmJpeg2000.cxx\r
        gdcmRLE.cxx\r
        gdcmParse.cxx\r
-       gdcmJpegIdo.cxx\r
+       gdcmJpegIdo.cxx # to be removed\r
 )\r
 #-----------------------------------------------------------------------------\r
 # Why one should not use ADD_DEFINITIONS\r
@@ -49,16 +51,18 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(gdcm \r
     gdcmijpeg8 \r
     gdcmijpeg12\r
+    gdcmjpeg     # JPEG lib from xmedcom \r
   )\r
 ELSE(UNIX)\r
   TARGET_LINK_LIBRARIES(gdcm \r
     gdcmijpeg8 \r
     gdcmijpeg12\r
+    gdcmjpeg\r 
     Wsock32.lib   #doesn't exist on cygwin\r
   )\r
 ENDIF(UNIX)\r
 \r
-#The following is not wroking because when a header file is not found it tries \r
+#The following is not working because when a header file is not found it tries \r
 #to find one in the binary dir\r
 #INSTALL_FILES(/include .h ${libgdcm_la_SOURCES})\r
 #INSTALL_FILES(/include FILES gdcmIdo.h iddcmjpeg.h)\r

diff --git a/src/Makefile.am b/src/Makefile.am
index 6c1881ad974a1f22f005580238f3ec7685f189dd..aad63b014ef15da37bcf9000888ce10b1d7c6b6f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,8 +9,8 @@ CXXFLAGS = @CXXFLAGS@ -DPUB_DICT_PATH=\"$(datadir)/gdcm/\" \
 
 libgdcm_la_LIBADD = \
    $(top_builddir)/src/jpeg/libijg12/libgdcmijpeg12.la  \
-   $(top_builddir)/src/jpeg/libijg8/libgdcmijpeg8.la
-
+   $(top_builddir)/src/jpeg/libijg8/libgdcmijpeg8.la    \
+   $(top_builddir)/src/jpeg/ljpg/libgdcmjpg.la 
 
 libgdcm_la_SOURCES=            \
        gdcmException.cxx       \

diff --git a/src/gdcmRLE.cxx b/src/gdcmRLE.cxx
index ae9149c3a5ca643c186ab09fdfe2b71cdca04e12..8930df2118ff953b836bc65b6aee05b3144160ef 100644 (file)
--- a/src/gdcmRLE.cxx
+++ b/src/gdcmRLE.cxx
@@ -19,8 +19,8 @@ static int _gdcm_read_RLE_fragment (char ** image_buffer,
  * \ingroup   gdcmFile
  * \brief     Reads a 'Run Length Encoded' Dicom encapsulated file
  * @param     image_buffer destination Address (in caller's memory space) 
- *            at which the
- *            pixel data should be copied
+ *            at which the pixel data should be copied
+ *   
  * @return    int acts as a Boolean 
  */
 
@@ -28,6 +28,9 @@ static int _gdcm_read_RLE_fragment (char ** image_buffer,
 // Forget the printf as they will be removed
 // as soon as the last Heuristics are checked
 
+// pb with RLE 16 Bits : 
+
+
 int
 gdcmFile::gdcm_read_RLE_file (void * image_buffer) {
    long fragmentBegining; // for ftell, fseek

diff --git a/src/stamp-h.in b/src/stamp-h.in
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9788f70238c91894045d22366fa941580826c3c1 100644 (file)
--- a/src/stamp-h.in
+++ b/src/stamp-h.in
@@ -0,0 +1 @@
+timestamp