X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelConvert.h;h=074db2ba22c52362815e112674491c8a46063087;hb=0b01703cc07d46a6ae718e01c6beee14599a9da1;hp=4de455554c33c9fe98cbb020ced6ddd77817050c;hpb=f5028f34faa657dc1722331963f97c7734ee2d2a;p=gdcm.git

diff --git a/src/gdcmPixelConvert.h b/src/gdcmPixelConvert.h
index 4de45555..074db2ba 100644
--- a/src/gdcmPixelConvert.h
+++ b/src/gdcmPixelConvert.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelConvert.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/20 22:31:52 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2004/10/25 04:08:20 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,7 +18,7 @@
 
 
 #ifndef GDCMPIXELCONVERT_H
-#define GDCMPIXELCONVERTL_H
+#define GDCMPIXELCONVERT_H
 
 #include "gdcmCommon.h"
 #include "gdcmRLEFramesInfo.h"
@@ -28,12 +28,12 @@
 
 namespace gdcm
 {
-                                                                                
 /*
  * \brief Utility container for gathering the various forms the pixel data
  *        migth take during the user demanded processes.
  */
-class GDCM_EXPORT PixelConvert {
+class GDCM_EXPORT PixelConvert
+{
 public:
    PixelConvert();
    ~PixelConvert();
@@ -52,7 +52,7 @@ public:
 
 // In progress
    void GrabInformationsFromHeader( Header* header );
-   bool ReadAndDecompressPixelData( FILE* fp );
+   bool ReadAndDecompressPixelData( std::ifstream* fp );
    void Squeeze();
    bool BuildRGBImage();
 
@@ -62,10 +62,11 @@ private:
                   uint8_t* subDecompressed,
                   long fragmentSize,
                   long decompressedSegmentSize,
-                  FILE* fp );
-   void ReadAndDecompress12BitsTo16Bits( FILE* fp ) throw ( FormatError );
-   bool ReadAndDecompressRLEFile( FILE* fp );
-   bool ReadAndDecompressJPEGFile( FILE* fp );
+                  std::ifstream* fp );
+   void ReadAndDecompress12BitsTo16Bits( std::ifstream* fp ) throw ( FormatError );
+   bool ReadAndDecompressRLEFile( std::ifstream* fp );
+   bool ReadAndDecompressJPEGFile( std::ifstream* fp );
+   void BuildLUTRGBA( std::ifstream* fp );
 
    // In place (within Decompressed and with no fp access) decompression
    // or convertion: