update Changelog

diff --git a/ChangeLog b/ChangeLog
index 03d50a90933cf08635258642a39ef089793428ad..a1129a7a4876aa4b5639f048bfe195c172b82a80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
+2003-11-03 Jean-Pierre Roux
+     * add gdcmHeaderHelper::GetNumberOfScalarComponentsRaw()
+           to be used by aware (vtk) users that want to manage
+          LUT (and no to turn the PALETTE image into an RGB pixels one)
+     * GetPixelType now returns 8U for 24 Bits images
+                    (vtkGdcmReader compliant)             
+          
+2003-10-31 Jean-Pierre Roux
+     * Removal of *all* gdcmData images and add them again
+       in order to loose the 'history' of un-anonymised images
+       
 2003-10-31 Jean-Pierre Roux
-     RMV : removal of useless jBitsInJsample.h 
+     *RMV : removal of useless jBitsInJsample.h 
            for both 8 and 12 Bits JPEG Lossy Libraries
           
 2003-10-31 Jean-Pierre Roux
@@ -70,8 +81,9 @@
          one for the high Bytes, the other for low Bytes)
 
 2003-10-22 Jean-Pierre Roux
-     * Now CheckRead takes into account the bugged 'Leonardo' Siemens images
-        and XA images, sent thru the burning VPRO station
+     * Now CheckRead takes into account :
+            the bugged 'Leonardo' Siemens images
+            the XA images, sent thru the burning VPRO station
      * add I9000001.dcm, a GE dlx XA image, thru the VEPRO burning station
      (breaks DicomWorks)
 
@@ -112,8 +124,7 @@
        * add US.3405.1.dcm, a genuine RGB medical file ...
        * add gdcm-ACR-LibIDO.acr, unnormalized Rectangular LibIDO format image
        * add CLIP0001-Sequoia-U11.dcm, US 'Clip', from SEQUOIA machine, 
-                                                  UNIT 11, Hop Cardio
-              
+                                                  UNIT 11, Hop Cardio              
 2003-10-15  Jean-Pierre Roux
       * general anonymisation in gdcmData
       * adding the 'color files' from
@@ -135,7 +146,7 @@
 2003-10-14  Jean-Pierre Roux
      * Some supposed-to-be Dicom Images have no preamble.
         OpenFile takes it into account
-     * Jpeg LossLess 24 Bits images doesn-t break any longer gdcm
+     * Jpeg LossLess 24 Bits images doesn't break any longer gdcm
      * Missing elements added in dicomV3.dic
       (just to be affraid : have a look at
        ftp://medical.nema.org/medical/dicom/2003/01v03dif/01v03_06.pdf
@@ -552,7 +563,7 @@
         at configure (or autogen.sh) stage.
 
 2003-04-16  Eric Boix <Eric.Boix@creatis.insa-lyon.fr> with JPR
-      * More memmory link related corrections and documentation fixes.
+      * More memory link related corrections and documentation fixes.
         Notes on valgrind:
           - maximum info is obtained with a command of the form:
             valgrind --leak-check=yes --leak-resolution=high --num-callers=40

diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx
index aaa0d53b21ebc5b00032012a2f70a8d71753d844..e92fd5b3f17f2cd4cd70c5189042f8f32fa95412 100644 (file)
--- a/vtk/vtkGdcmReader.cxx
+++ b/vtk/vtkGdcmReader.cxx
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.cxx,v 1.22 2003/10/30 17:06:02 jpr Exp $
+// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.cxx,v 1.23 2003/11/03 10:51:47 jpr Exp $
 // //////////////////////////////////////////////////////////////
 // WARNING TODO CLENAME 
 // Actual limitations of this code:
@@ -239,6 +239,7 @@ int vtkGdcmReader::CheckFileCoherence()
          && (type != "32U") && (type != "32S") )
        {
        vtkErrorMacro("Bad File Type for file" << FileName->c_str());
+       vtkErrorMacro("                      " << type);
        vtkErrorMacro("Removing this file from readed files "
                      << FileName->c_str());
        *FileName = "GDCM_UNREADABLE";
@@ -307,6 +308,11 @@ int vtkGdcmReader::CheckFileCoherence()
        ReturnedTotalNumberOfPlanes += NZ - 1; // First plane already added
        this->ImageType = type;
        this->PixelSize = GdcmHeader.GetPixelSize();
+       
+       // JPR to Mathieu:
+       // Be carefull : when u'll pane to use 'GetImageDataRaw',
+       // use 'GetNumberOfScalarComponentsRaw' ! 
+     
        this->NumComponents = GdcmHeader.GetNumberOfScalarComponents(); //rgb or mono
        
        //Set image spacing
@@ -357,7 +363,7 @@ void vtkGdcmReader::ExecuteInformation()
     }
       
   // if the user has not set the extent, but has set the VOI
-  // set the zaxis extent to the VOI z axis
+  // set the z axis extent to the VOI z axis
   if (this->DataExtent[4]==0 && this->DataExtent[5] == 0 &&
      (this->DataVOI[4] || this->DataVOI[5]))
     {