X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelConvert.cxx;h=28653c12135dbbc442b1d0aa28b04d5115edc189;hb=edfc14dd195f9759cf02da0959d96d1499d572be;hp=05fe19d642c77f7c4cd49814c38d75b5b2dfb02a;hpb=c42ce41966ee7a572752d7f45ddff25b90515119;p=gdcm.git

diff --git a/src/gdcmPixelConvert.cxx b/src/gdcmPixelConvert.cxx
index 05fe19d6..28653c12 100644
--- 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/24 10:23:47 $
-  Version:   $Revision: 1.32 $
+  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
@@ -273,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, 
@@ -413,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 )
       {
@@ -587,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 )
@@ -598,7 +601,7 @@ bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp )
       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: "
@@ -606,6 +609,8 @@ bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp )
       return false;
    }
 
+   AllocateDecompressed();
+
    //////////////////////////////////////////////////
    //// Second stage: read from disk dans decompress.
    if ( BitsAllocated == 12 )
@@ -771,7 +776,10 @@ void PixelConvert::ComputeDecompressedAndRGBSizes()
    {
       RGBSize = 3 * DecompressedSize;
    }
-
+   else
+   {
+      RGBSize = DecompressedSize;
+   }
 }
 
 void PixelConvert::GrabInformationsFromHeader( Header* header )
@@ -861,13 +869,12 @@ 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;
          }
       }
 
@@ -879,13 +886,12 @@ 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;
          }
       }
 
@@ -897,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;
          }
       }
    }
 
-   if(fp) header->CloseFile();
+   ComputeDecompressedAndRGBSizes();
+
+   if(fp) 
+   {
+      header->CloseFile();
+   }
 }
 
 /**