X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.cxx;h=ba2b53f9d0d853e22487ec24ac5ecd41594de2ef;hb=ba8ca5c7ae54ae183c5d88dba3a8f2e3098ce017;hp=c2030a433b017ffd48e60291db76232e1189d336;hpb=b6669dfbeb4eac3052f6b8755eff1eb34a0dcea5;p=gdcm.git

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index c2030a43..ba2b53f9 100644
--- a/src/gdcmPixelReadConvert.cxx
+++ b/src/gdcmPixelReadConvert.cxx
@@ -1,10 +1,10 @@
 /*=========================================================================
-
+ 
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/30 14:50:05 $
-  Version:   $Revision: 1.73 $
+  Date:      $Date: 2005/08/19 13:15:05 $
+  Version:   $Revision: 1.76 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -50,6 +50,10 @@ PixelReadConvert::PixelReadConvert()
    LutRedData   = 0;
    LutGreenData = 0;
    LutBlueData  = 0;
+   RLEInfo      = 0;
+   JPEGInfo     = 0;
+   UserFunction = 0;
+   FileInternal = 0;
 }
 
 /// Canonical Destructor
@@ -107,7 +111,7 @@ void PixelReadConvert::GrabInformationsFromFile( File *file )
    YSize           = file->GetYSize();
    ZSize           = file->GetZSize();
    SamplesPerPixel = file->GetSamplesPerPixel();
-   PixelSize       = file->GetPixelSize();
+   //PixelSize       = file->GetPixelSize();  Useless
    PixelSign       = file->IsSignedPixelData();
    SwapCode        = file->GetSwapCode();
    std::string ts  = file->GetTransferSyntax();
@@ -186,6 +190,7 @@ void PixelReadConvert::GrabInformationsFromFile( File *file )
          gdcmWarningMacro( "Unable to read Blue Palette Color Lookup Table data" );
       }
    }
+   FileInternal = file;   
 
    ComputeRawAndRGBSizes();
 }
@@ -259,7 +264,8 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp )
    {
       //gdcmWarningMacro( "Sorry, MPEG not yet taken into account" );
       //return false;
-      //ReadMPEGFile(fp, Raw, PixelDataLength); // fp has already been seek to start of mpeg
+      // fp has already been seek to start of mpeg
+      //ReadMPEGFile(fp, Raw, PixelDataLength); 
       return true;
    }
    else
@@ -277,6 +283,8 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp )
    ConvertReorderEndianity();
    ConvertReArrangeBits();
    ConvertFixGreyLevels();
+   if (UserFunction) // user is allowed to Mirror, TopDown, Rotate,...the image
+      UserFunction( Raw, FileInternal);
    ConvertHandleColor();
 
    return true;
@@ -1279,14 +1287,3 @@ void PixelReadConvert::Print( std::ostream &os, std::string const &indent )
 
 //-----------------------------------------------------------------------------
 } // end namespace gdcm
-
-// NOTES on File internal calls
-// User
-// ---> GetImageData
-//     ---> GetImageDataIntoVector
-//        |---> GetImageDataIntoVectorRaw
-//        | lut intervention
-// User
-// ---> GetImageDataRaw
-//     ---> GetImageDataIntoVectorRaw
-