From 33408a77aa58c5c86633edb34f670536a6d45bc6 Mon Sep 17 00:00:00 2001
From: jpr <jpr>
Date: Tue, 21 Oct 2003 12:22:28 +0000
Subject: [PATCH] Makefile.am,CMakeLists.txt updated to deal with the new
 library

---
 src/CMakeLists.txt | 8 ++++++--
 src/Makefile.am    | 4 ++--
 src/gdcmRLE.cxx    | 7 +++++--
 src/stamp-h.in     | 1 +
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 97b8086f..43e70ff9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,8 @@ SUBDIRS(jpeg)
 INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/jpeg/libijg8
   #${GDCM_SOURCE_DIR}/jpeg/libijg12 #all files have been renamed, appending 12
+  #${GDCM_SOURCE_DIR}/jpeg/ljpg     # JPEG lib from xmedcom 
+                                    #
 )
 
 SET(libgdcm_la_SOURCES
@@ -27,7 +29,7 @@ SET(libgdcm_la_SOURCES
 	gdcmJpeg2000.cxx
 	gdcmRLE.cxx
 	gdcmParse.cxx
-	gdcmJpegIdo.cxx
+	gdcmJpegIdo.cxx # to be removed
 )
 #-----------------------------------------------------------------------------
 # Why one should not use ADD_DEFINITIONS
@@ -49,16 +51,18 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(gdcm 
     gdcmijpeg8 
     gdcmijpeg12
+    gdcmjpeg     # JPEG lib from xmedcom 
   )
 ELSE(UNIX)
   TARGET_LINK_LIBRARIES(gdcm 
     gdcmijpeg8 
     gdcmijpeg12
+    gdcmjpeg
 
     Wsock32.lib   #doesn't exist on cygwin
   )
 ENDIF(UNIX)
 
-#The following is not wroking because when a header file is not found it tries 
+#The following is not working because when a header file is not found it tries 
 #to find one in the binary dir
 #INSTALL_FILES(/include .h ${libgdcm_la_SOURCES})
 #INSTALL_FILES(/include FILES gdcmIdo.h iddcmjpeg.h)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6c1881ad..aad63b01 100644
--- 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 ae9149c3..8930df21 100644
--- 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 e69de29b..9788f702 100644
--- a/src/stamp-h.in
+++ b/src/stamp-h.in
@@ -0,0 +1 @@
+timestamp
-- 
2.48.1