Fix mistypings

[gdcm.git] / src / gdcmPixelReadConvert.h

diff --git a/src/gdcmPixelReadConvert.h b/src/gdcmPixelReadConvert.h
index 384f09e32e2ad7d42ce06b9ee0d865de45412d38..62856a86bddd46caf1d06381b5ceae3621e77acb 100644 (file)
--- a/src/gdcmPixelReadConvert.h
+++ b/src/gdcmPixelReadConvert.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.h,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 10:32:05 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2007/09/17 12:18:25 $
+  Version:   $Revision: 1.33 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,14 +17,17 @@
 =========================================================================*/
 
 
-#ifndef GDCMPIXELREADCONVERT_H
-#define GDCMPIXELREADCONVERT_H
+#ifndef _GDCMPIXELREADCONVERT_H_
+#define _GDCMPIXELREADCONVERT_H_
 
 #include "gdcmBase.h"
+#include "gdcmFileHelper.h"
 #include "gdcmException.h"
+#include "gdcmCommandManager.h"
+
 #include <fstream>
 
-namespace gdcm
+namespace GDCM_NAME_SPACE
 {
 class File;
 class RLEFramesInfo;
@@ -35,7 +38,7 @@ typedef void (*VOID_FUNCTION_PUINT8_PFILE_POINTER)(uint8_t *, File *);
 /**
  * \brief Utility container for gathering the various forms the pixel data
  *        migth take during the user demanded processes.
- * WARNING : *none* of these functions may be invoked by gdm user
+ * WARNING : *none* of these functions may be invoked by gdcm user
  *           (internal use only)
  */
 class GDCM_EXPORT PixelReadConvert : public Base
@@ -67,18 +70,18 @@ private:
    bool IsRawRGB();
 
 // In progress
-   void GrabInformationsFromFile( File *file );
+   void GrabInformationsFromFile( File *file, FileHelper *fileHelper );
    bool ReadAndDecompressPixelData( std::ifstream *fp );
    void Squeeze();
    bool BuildRGBImage();
    void BuildLUTRGBA();
 /// \brief Allow user to pass his own function to modify pixels 
 ///        (e.g; mirror, upsidedown, ...) just after reading
-   void SetUserFunction( VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc ) 
+   void SetUserFunction( VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc )
                          { UserFunction = userFunc; }
 
    // Use the fp:
-   void ReadAndDecompress12BitsTo16Bits( std::ifstream *fp ) 
+   void ReadAndDecompress12BitsTo16Bits( std::ifstream *fp )
                                  throw ( FormatError );
    bool ReadAndDecompressJPEGFile( std::ifstream *fp );
 
@@ -96,6 +99,10 @@ private:
    void AllocateRGB();
    void AllocateRaw();
 
+   void CallStartMethod();
+   void CallProgressMethod();
+   void CallEndMethod();
+
 // Variables
 /**
  * \brief Pixel data represented as RGB after LUT color interpretation.
@@ -110,7 +117,7 @@ private:
    /// Size of Decompressed image.
    size_t   RawSize;
    /// \brief Red/Green/Blue/Alpha LookUpTable build out of the
-   ///        Red/Green/Blue LUT descriptors (see \ref BuildLUTRGBA ).
+   ///        Red/Green/Blue LUT descriptors (see  BuildLUTRGBA ).
    uint8_t *LutRGBA;
    int LutItemNumber;
    int LutItemSize;
@@ -123,6 +130,7 @@ private:
    int XSize;
    int YSize;
    int ZSize;
+   int TSize;
    int BitsAllocated;
    int BitsStored;
    int HighBitPosition;
@@ -130,11 +138,11 @@ private:
    //int PixelSize; // useless
    bool PixelSign;
    int SwapCode;
-   
+
    // cache whether this is a strange GE transfer syntax (which has   
    // one transfer syntax for the header and another for the pixel data).
    bool IsPrivateGETransferSyntax;
-    
+
    bool IsRaw;
    bool IsJPEG2000;
    bool IsJPEGLS;
@@ -164,6 +172,10 @@ private:
    
    File *FileInternal; // must be passed to User Function
    VOID_FUNCTION_PUINT8_PFILE_POINTER UserFunction;
+   /// Needed for the progression bar stuff
+   FileHelper *FH;
+   mutable bool Abort;
+   float Progress;
 };
 } // end namespace gdcm