* src/gdcmDocument.cxx : fix bug... test if the fp is opened to use it

[gdcm.git] / src / gdcmPixelConvert.cxx

diff --git a/src/gdcmPixelConvert.cxx b/src/gdcmPixelConvert.cxx
index cf3c240aa84d1134816a5367a65cac50fe475bd8..d3d6b7aa980d70c5d77f1e980cacd173415f7171 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/10 18:27:23 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2004/11/25 10:24:34 $
+  Version:   $Revision: 1.33 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -66,14 +66,19 @@ void PixelConvert::Squeeze()
    {
       delete [] RGB;
    } 
+   RGB = 0;
+
    if ( Decompressed )
    {
       delete [] Decompressed;
    }
+   Decompressed = 0;
+
    if ( LutRGBA )
    {
       delete [] LutRGBA;
    }
+   LutRGBA = 0;
 }
 
 PixelConvert::~PixelConvert() 
@@ -582,8 +587,11 @@ void PixelConvert::ConvertRGBPlanesToRGBPixels()
 
 bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp )
 {
-   ComputeDecompressedAndRGBSizes();
-   AllocateDecompressed();
+   // ComputeDecompressedAndRGBSizes is already made by 
+   // ::GrabInformationsFromHeader. So, the structure sizes are
+   // correct
+   Squeeze();
+
    //////////////////////////////////////////////////
    //// First stage: get our hands on the Pixel Data.
    if ( !fp )
@@ -601,6 +609,8 @@ bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp )
       return false;
    }
 
+   AllocateDecompressed();
+
    //////////////////////////////////////////////////
    //// Second stage: read from disk dans decompress.
    if ( BitsAllocated == 12 )
@@ -766,7 +776,10 @@ void PixelConvert::ComputeDecompressedAndRGBSizes()
    {
       RGBSize = 3 * DecompressedSize;
    }
-
+   else
+   {
+      RGBSize = DecompressedSize;
+   }
 }
 
 void PixelConvert::GrabInformationsFromHeader( Header* header )
@@ -808,6 +821,7 @@ void PixelConvert::GrabInformationsFromHeader( Header* header )
    IsDecompressed =
         ( ! header->IsDicomV3() )
      || ts == ImplicitVRLittleEndian
+     || ts == ImplicitVRLittleEndianDLXGE
      || ts == ExplicitVRLittleEndian
      || ts == ExplicitVRBigEndian
      || ts == DeflatedExplicitVRLittleEndian;
@@ -861,10 +875,9 @@ void PixelConvert::GrabInformationsFromHeader( Header* header )
          {
             dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: "
                             "unable to read red LUT data" );
-            return;
          }
       }
-   
+
       ////// Green round:
       LutGreenData = (uint8_t*)header->GetEntryBinAreaByNumber(0x0028, 0x1202 );
       if ( ! LutGreenData)
@@ -879,10 +892,9 @@ void PixelConvert::GrabInformationsFromHeader( Header* header )
          {
             dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: "
                            "unable to read green LUT data" );
-            return;
          }
       }
-                                                                                   
+
       ////// Blue round:
       LutBlueData = (uint8_t*)header->GetEntryBinAreaByNumber( 0x0028, 0x1203 );
       if ( ! LutBlueData )
@@ -897,12 +909,16 @@ void PixelConvert::GrabInformationsFromHeader( Header* header )
          {
             dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: "
                            "unable to read blue LUT data" );
-            return;
          }
       }
    }
-                                                                                
-   if(fp) header->CloseFile();
+
+   ComputeDecompressedAndRGBSizes();
+
+   if(fp) 
+   {
+      header->CloseFile();
+   }
 }
 
 /**