*** empty log message ***

[gdcm.git] / src / gdcmPixelConvert.cxx

diff --git a/src/gdcmPixelConvert.cxx b/src/gdcmPixelConvert.cxx
index add7134726c594d2b85ef74212bc056993add3f0..28653c12135dbbc442b1d0aa28b04d5115edc189 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/08 20:05:52 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2004/11/30 16:59:32 $
+  Version:   $Revision: 1.34 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -25,6 +25,7 @@
 #include "gdcmDebug.h"
 #include "gdcmPixelConvert.h"
 #include <fstream>
+#include <stdio.h>
 
 namespace gdcm
 {
@@ -65,14 +66,19 @@ void PixelConvert::Squeeze()
    {
       delete [] RGB;
    } 
+   RGB = 0;
+
    if ( Decompressed )
    {
       delete [] Decompressed;
    }
+   Decompressed = 0;
+
    if ( LutRGBA )
    {
       delete [] LutRGBA;
    }
+   LutRGBA = 0;
 }
 
 PixelConvert::~PixelConvert() 
@@ -173,8 +179,8 @@ bool PixelConvert::DecompressRLE16BitsFromRLE8Bits( int NumberOfFrames )
    {
       for ( unsigned int j = 0; j < PixelNumber; j++ )
       {
-         *(x++) = *(a++);
          *(x++) = *(b++);
+         *(x++) = *(a++);
       }
    }
 
@@ -267,7 +273,7 @@ bool PixelConvert::ReadAndDecompressRLEFile( std::ifstream* fp )
       // Loop on the fragments
       for( unsigned int k = 1; k <= (*it)->NumberFragments; k++ )
       {
-         fp->seekg(  (*it)->Offset[k] , std::ios_base::beg );
+         fp->seekg(  (*it)->Offset[k] , std::ios::beg );
          (void)ReadAndDecompressRLEFragment( subDecompressed,
                                              (*it)->Length[k],
                                              decompressedSegmentSize, 
@@ -407,7 +413,7 @@ bool PixelConvert::ReadAndDecompressJPEGFile( std::ifstream* fp )
         it != JPEGInfo->Fragments.end();
       ++it )
    {
-      fp->seekg( (*it)->Offset, std::ios_base::beg);
+      fp->seekg( (*it)->Offset, std::ios::beg);
 
       if ( IsJPEG2000 )
       {
@@ -581,25 +587,30 @@ 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 )
    {
-     dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: "
-                     "unavailable file pointer." );
+      dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: "
+                      "unavailable file pointer." );
       return false;
    }
 
-   fp->seekg( PixelOffset, std::ios_base::beg );
+   fp->seekg( PixelOffset, std::ios::beg );
    if( fp->fail() || fp->eof()) //Fp->gcount() == 1
    {
-     dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: "
-                     "unable to find PixelOffset in file." );
+      dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: "
+                      "unable to find PixelOffset in file." );
       return false;
    }
 
+   AllocateDecompressed();
+
    //////////////////////////////////////////////////
    //// Second stage: read from disk dans decompress.
    if ( BitsAllocated == 12 )
@@ -608,7 +619,24 @@ bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp )
    }
    else if ( IsDecompressed )
    {
-      fp->read( (char*)Decompressed, PixelDataLength);
+      // This problem can be found when some obvious informations are found
+      // after the field containing the image datas. In this case, these
+      // bad datas are added to the size of the image (in the PixelDataLength
+      // variable). But DecompressedSize is the right size of the image !
+      if( PixelDataLength != DecompressedSize)
+      {
+         dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: "
+                      "Mismatch between PixelConvert and DecompressedSize." );
+      }
+      if( PixelDataLength > DecompressedSize)
+      {
+         fp->read( (char*)Decompressed, DecompressedSize);
+      }
+      else
+      {
+         fp->read( (char*)Decompressed, PixelDataLength);
+      }
+
       if ( fp->fail() || fp->eof())//Fp->gcount() == 1
       {
          dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: "
@@ -748,7 +776,10 @@ void PixelConvert::ComputeDecompressedAndRGBSizes()
    {
       RGBSize = 3 * DecompressedSize;
    }
-
+   else
+   {
+      RGBSize = DecompressedSize;
+   }
 }
 
 void PixelConvert::GrabInformationsFromHeader( Header* header )
@@ -790,6 +821,7 @@ void PixelConvert::GrabInformationsFromHeader( Header* header )
    IsDecompressed =
         ( ! header->IsDicomV3() )
      || ts == ImplicitVRLittleEndian
+     || ts == ImplicitVRLittleEndianDLXGE
      || ts == ExplicitVRLittleEndian
      || ts == ExplicitVRBigEndian
      || ts == DeflatedExplicitVRLittleEndian;
@@ -837,16 +869,15 @@ void PixelConvert::GrabInformationsFromHeader( Header* header )
          DocEntry* lutRedDataEntry = header->GetDocEntryByNumber( 0x0028,
                                                                   0x1201 );
          LutRedData = new uint8_t[ lutRedDataEntry->GetLength() ];
-         fp->seekg(  lutRedDataEntry->GetOffset() ,std::ios_base::beg );
+         fp->seekg(  lutRedDataEntry->GetOffset() ,std::ios::beg );
          fp->read( (char*)LutRedData, (size_t)lutRedDataEntry->GetLength());
          if ( fp->fail() || fp->eof())//Fp->gcount() == 1
          {
             dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: "
                             "unable to read red LUT data" );
-            return;
          }
       }
-   
+
       ////// Green round:
       LutGreenData = (uint8_t*)header->GetEntryBinAreaByNumber(0x0028, 0x1202 );
       if ( ! LutGreenData)
@@ -855,16 +886,15 @@ void PixelConvert::GrabInformationsFromHeader( Header* header )
          DocEntry* lutGreenDataEntry = header->GetDocEntryByNumber( 0x0028,
                                                                     0x1202 );
          LutGreenData = new uint8_t[ lutGreenDataEntry->GetLength() ];
-         fp->seekg( lutGreenDataEntry->GetOffset() , std::ios_base::beg );
+         fp->seekg( lutGreenDataEntry->GetOffset() , std::ios::beg );
          fp->read( (char*)LutGreenData, (size_t)lutGreenDataEntry->GetLength() );
          if ( fp->fail() || fp->eof())//Fp->gcount() == 1
          {
             dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: "
                            "unable to read green LUT data" );
-            return;
          }
       }
-                                                                                   
+
       ////// Blue round:
       LutBlueData = (uint8_t*)header->GetEntryBinAreaByNumber( 0x0028, 0x1203 );
       if ( ! LutBlueData )
@@ -873,18 +903,22 @@ void PixelConvert::GrabInformationsFromHeader( Header* header )
          DocEntry* lutBlueDataEntry  = header->GetDocEntryByNumber( 0x0028,
                                                                     0x1203 );
          LutBlueData = new uint8_t[ lutBlueDataEntry->GetLength() ];
-         fp->seekg(  lutBlueDataEntry->GetOffset() , std::ios_base::beg );
+         fp->seekg(  lutBlueDataEntry->GetOffset() , std::ios::beg );
          fp->read( (char*)LutBlueData, (size_t)lutBlueDataEntry->GetLength() );
          if ( fp->fail() || fp->eof())//Fp->gcount() == 1
          {
             dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: "
                            "unable to read blue LUT data" );
-            return;
          }
       }
    }
-                                                                                
-   header->CloseFile();
+
+   ComputeDecompressedAndRGBSizes();
+
+   if(fp) 
+   {
+      header->CloseFile();
+   }
 }
 
 /**