* No comments...

[gdcm.git] / src / gdcmPixelReadConvert.cxx

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index 1536ad4a4fb1c8ceaa09fb65d2086e084e7edd2a..27ff8e2b83384398ebb43b587b4f63467d724c31 100644 (file)
--- a/src/gdcmPixelReadConvert.cxx
+++ b/src/gdcmPixelReadConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/31 05:24:21 $
-  Version:   $Revision: 1.41 $
+  Date:      $Date: 2005/02/01 10:29:55 $
+  Version:   $Revision: 1.43 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -30,9 +30,9 @@
 
 namespace gdcm
 {
+//-----------------------------------------------------------------------------
 #define str2num(str, typeNum) *((typeNum *)(str))
 
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 PixelReadConvert::PixelReadConvert() 
@@ -47,6 +47,13 @@ PixelReadConvert::PixelReadConvert()
    LutBlueData =0;
 }
 
+PixelReadConvert::~PixelReadConvert() 
+{
+   Squeeze();
+}
+
+//-----------------------------------------------------------------------------
+// Public
 void PixelReadConvert::Squeeze() 
 {
    if ( RGB )
@@ -62,11 +69,6 @@ void PixelReadConvert::Squeeze()
    LutRGBA = 0;
 }
 
-PixelReadConvert::~PixelReadConvert() 
-{
-   Squeeze();
-}
-
 void PixelReadConvert::AllocateRGB()
 {
   if ( RGB )
@@ -440,7 +442,7 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp )
    } 
    else if ( IsRLELossless )
    {
-      if ( ! RLEInfo->ReadAndDecompressRLEFile( fp, Raw, XSize, YSize, ZSize, BitsAllocated ) )
+      if ( ! RLEInfo->DecompressRLEFile( fp, Raw, XSize, YSize, ZSize, BitsAllocated ) )
       {
          gdcmVerboseMacro( "RLE decompressor failed." );
          return false;
@@ -854,6 +856,14 @@ bool PixelReadConvert::BuildRGBImage()
    return true;
 }
 
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+// Print
 /**
  * \brief        Print self.
  * @param indent Indentation string to be prepended during printing.
@@ -896,6 +906,7 @@ void PixelReadConvert::Print( std::ostream &os, std::string const & indent )
    }
 }
 
+//-----------------------------------------------------------------------------
 } // end namespace gdcm
 
 // NOTES on File internal calls