ENH: Some more minor fixes, to synchronize ITK and gdcm

diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx
index c43f1fcc479c4e3f4bf82978641b19b98f2fb463..59687f088dbe0aacfa0d13cdb8acdaac21157833 100644 (file)
--- a/src/gdcmJpeg12.cxx
+++ b/src/gdcmJpeg12.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpeg12.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/07 14:28:55 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2004/11/07 15:53:35 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,7 +18,7 @@
 #include "gdcmFile.h"
 
 extern "C" {
-#include "gdcmjpeg/12/jinclude.h"
+#include "gdcmjpeg/12/jconfig.h"
 #include "gdcmjpeg/12/jpeglib.h"
 }
 

diff --git a/src/gdcmJpeg16.cxx b/src/gdcmJpeg16.cxx
index fa9368dd1a4b6d171cd018739d79c85442e681e4..ec377bc76350d2fe88a5204afac3cb8d9cc2a8a3 100644 (file)
--- a/src/gdcmJpeg16.cxx
+++ b/src/gdcmJpeg16.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpeg16.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/07 14:28:55 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2004/11/07 15:53:35 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,7 +18,7 @@
 #include "gdcmFile.h"
 
 extern "C" {
-#include "gdcmjpeg/16/jinclude.h"
+#include "gdcmjpeg/16/jconfig.h"
 #include "gdcmjpeg/16/jpeglib.h"
 }
 

diff --git a/src/gdcmjpeg/CMakeLists.txt b/src/gdcmjpeg/CMakeLists.txt
index 7a905f3beab21bcae667ed133550a3eba05211f8..b41615cb58a9d9724e3328865ea18bb115ff5584 100644 (file)
--- a/src/gdcmjpeg/CMakeLists.txt
+++ b/src/gdcmjpeg/CMakeLists.txt
@@ -111,8 +111,6 @@ FOREACH(bits 8 12 16)
                  ${CMAKE_CURRENT_BINARY_DIR}/${bits}/jpeglib.h COPYONLY IMMEDIATE)
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/jerror.h
                  ${CMAKE_CURRENT_BINARY_DIR}/${bits}/jerror.h COPYONLY IMMEDIATE)
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/jinclude.h
-                 ${CMAKE_CURRENT_BINARY_DIR}/${bits}/jinclude.h COPYONLY IMMEDIATE)
 ENDFOREACH(bits)
 
 SUBDIRS(8 12 16)