ENH: Apply pach suggested by JP. This should handle more jpeg compress images. Also...

diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx
index 59687f088dbe0aacfa0d13cdb8acdaac21157833..3be3868f265f877aba75838a45f1de60fe5cede4 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 15:53:35 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2004/11/08 20:05:52 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,6 +20,8 @@
 extern "C" {
 #include "gdcmjpeg/12/jconfig.h"
 #include "gdcmjpeg/12/jpeglib.h"
+#include "gdcmjpeg/12/jinclude.h"
+#include "gdcmjpeg/12/jerror.h"
 }
 
 #define gdcm_write_JPEG_file gdcm_write_JPEG_file12

diff --git a/src/gdcmJpeg16.cxx b/src/gdcmJpeg16.cxx
index ec377bc76350d2fe88a5204afac3cb8d9cc2a8a3..a0c96ac615fc94f670d9e880d65dc215bd419167 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 15:53:35 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2004/11/08 20:05:52 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,6 +20,8 @@
 extern "C" {
 #include "gdcmjpeg/16/jconfig.h"
 #include "gdcmjpeg/16/jpeglib.h"
+#include "gdcmjpeg/16/jinclude.h"
+#include "gdcmjpeg/16/jerror.h"
 }
 
 #define gdcm_write_JPEG_file gdcm_write_JPEG_file16

diff --git a/src/gdcmJpeg8.cxx b/src/gdcmJpeg8.cxx
index f0402549055094ed7df40b6edd2f76a8539ae029..bd6aec71296e6cd2a4e9c7addf7f3dc555e1a480 100644 (file)
--- a/src/gdcmJpeg8.cxx
+++ b/src/gdcmJpeg8.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpeg8.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/07 14:28:55 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2004/11/08 20:05:52 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,6 +20,8 @@
 extern "C" {
 #include "gdcmjpeg/8/jconfig.h"
 #include "gdcmjpeg/8/jpeglib.h"
+#include "gdcmjpeg/8/jinclude.h"
+#include "gdcmjpeg/8/jerror.h"
 }
 
 #define gdcm_write_JPEG_file gdcm_write_JPEG_file8

diff --git a/src/gdcmPixelConvert.cxx b/src/gdcmPixelConvert.cxx
index dccf178e9ae5cb32fcce25680d1fb8a88e761873..add7134726c594d2b85ef74212bc056993add3f0 100644 (file)
--- a/src/gdcmPixelConvert.cxx
+++ b/src/gdcmPixelConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/04 18:14:34 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2004/11/08 20:05:52 $
+  Version:   $Revision: 1.24 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -424,7 +424,7 @@ bool PixelConvert::ReadAndDecompressJPEGFile( std::ifstream* fp )
             return false;
          }
       }
-      else if ( BitsStored == 12)
+      else if ( BitsStored <= 12)
       {
          // Reading Fragment pixels
          if ( ! gdcm_read_JPEG_file12 ( fp, localDecompressed ) )
@@ -432,7 +432,7 @@ bool PixelConvert::ReadAndDecompressJPEGFile( std::ifstream* fp )
             return false;
          }
       }
-      else if ( BitsStored == 16)
+      else if ( BitsStored <= 16)
       {
          // Reading Fragment pixels
          if ( ! gdcm_read_JPEG_file16 ( fp, localDecompressed ) )

diff --git a/src/gdcmjpeg/CMakeLists.txt b/src/gdcmjpeg/CMakeLists.txt
index b41615cb58a9d9724e3328865ea18bb115ff5584..7a905f3beab21bcae667ed133550a3eba05211f8 100644 (file)
--- a/src/gdcmjpeg/CMakeLists.txt
+++ b/src/gdcmjpeg/CMakeLists.txt
@@ -111,6 +111,8 @@ 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)

diff --git a/src/jdatasrc.cxx b/src/jdatasrc.cxx
index 336d23a24dd303832b6a7f85ffe42399fd57e4a0..e6c644307dd4b8840ba28903a23c4637b90cef67 100644 (file)
--- a/src/jdatasrc.cxx
+++ b/src/jdatasrc.cxx
@@ -15,8 +15,6 @@
  */
 
 /* this is not a core library module, so it doesn't define JPEG_INTERNALS */
-#include <gdcmjpeg/jinclude.h>
-#include <gdcmjpeg/jerror.h>
 
 /* Expanded data source object for stdio input */