X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.h;h=4aac9d3d3bdf83a663f2a9f1d87ef216564cf3f2;hb=e362e154b84f087750d1ed1f6671a34b3bf5ff7a;hp=79226b208add22ca06da821f5853af9d55df3dcf;hpb=f98b311871b6f42c92c20897bacca8cd0d731616;p=gdcm.git

diff --git a/src/gdcmPixelReadConvert.h b/src/gdcmPixelReadConvert.h
index 79226b20..4aac9d3d 100644
--- a/src/gdcmPixelReadConvert.h
+++ b/src/gdcmPixelReadConvert.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.h,v $
   Language:  C++
-  Date:      $Date: 2005/04/22 13:37:57 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2005/10/23 15:09:19 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,9 +20,9 @@
 #ifndef GDCMPIXELREADCONVERT_H
 #define GDCMPIXELREADCONVERT_H
 
-#include "gdcmCommon.h"
 #include "gdcmBase.h"
 #include "gdcmException.h"
+#include <fstream>
 
 namespace gdcm
 {
@@ -30,25 +30,39 @@ class File;
 class RLEFramesInfo;
 class JPEGFragmentsInfo;
 
+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
+ *           (internal use only)
  */
 class GDCM_EXPORT PixelReadConvert : public Base
 {
-public:
+friend class FileHelper;
+
+private:
    PixelReadConvert();
    virtual ~PixelReadConvert();
 
    void Print( std::ostream &os = std::cout, std::string const &indent = "" );
 
    // Getter accessors:
-   uint8_t *GetRGB()     { return RGB;     }
-   size_t   GetRGBSize() { return RGBSize; }
-   uint8_t *GetRaw()     { return Raw;     }
-   size_t   GetRawSize() { return RawSize; }
-   uint8_t *GetLutRGBA() { return LutRGBA; }
-
+   /// \brief returns pixel area holding RGB Pixels, made from Grey level + LUT
+   uint8_t *GetRGB()           { return RGB;     }
+   /// \brief returns pixel area length -RGB Pixels, (from Grey level + LUT)-
+   size_t   GetRGBSize()       { return RGBSize; }
+   /// \brief returns pixel area holding native RGB Pixels or Grey level
+   uint8_t *GetRaw()           { return Raw;     }
+   /// \brief returns pixel area size -native RGB Pixels or Grey level-
+   size_t   GetRawSize()       { return RawSize; }
+   /// \brief returns Red Green Blue Alpha LUT
+   uint8_t *GetLutRGBA()       { return LutRGBA; }
+   /// \brief returns Lut Item Number
+   int      GetLutItemNumber() { return LutItemNumber; }
+   /// \brief returns Lut Item Size
+   int      GetLutItemSize()   { return LutItemSize;   }
    // Predicates:
    bool IsRawRGB();
 
@@ -57,8 +71,12 @@ public:
    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 ) 
+                         { UserFunction = userFunc; }
 
-private:
    // Use the fp:
    void ReadAndDecompress12BitsTo16Bits( std::ifstream *fp ) 
                                  throw ( FormatError );
@@ -66,7 +84,6 @@ private:
 
    // In place (within Decompressed and with no fp access) decompression
    // or convertion:
-   void BuildLUTRGBA();
    void ConvertSwapZone();
    void ConvertReorderEndianity();
    bool ConvertReArrangeBits() throw ( FormatError );
@@ -80,7 +97,11 @@ private:
    void AllocateRaw();
 
 // Variables
-   /// Pixel data represented as RGB after LUT color interpretation.
+/**
+ * \brief Pixel data represented as RGB after LUT color interpretation.
+ *        'uint8_t' is just to avoid warnings at compile time.
+ *        feel free to cast it as uint16_t if you need
+ */ 
    uint8_t *RGB;
    /// Size of RGB image.
    size_t   RGBSize;
@@ -91,6 +112,11 @@ private:
    /// \brief Red/Green/Blue/Alpha LookUpTable build out of the
    ///        Red/Green/Blue LUT descriptors (see \ref BuildLUTRGBA ).
    uint8_t *LutRGBA;
+   int LutItemNumber;
+   int LutItemSize;
+
+   // *ALL* the following info belong to the FileHelper
+   // One should think there is an analyze error in the model !
 
    size_t PixelOffset;
    size_t PixelDataLength;
@@ -101,11 +127,12 @@ private:
    int BitsStored;
    int HighBitPosition;
    int SamplesPerPixel;
-   int PixelSize;
+   //int PixelSize; // useless
    bool PixelSign;
    int SwapCode;
 
    bool IsRaw;
+   bool IsPrivateGETransferSyntax;
    bool IsJPEG2000;
    bool IsJPEGLS;
    bool IsJPEGLossless;
@@ -131,7 +158,9 @@ private:
    uint8_t *LutRedData;
    uint8_t *LutGreenData;
    uint8_t *LutBlueData;
-
+   
+   File *FileInternal; // must be passed to User Function
+   VOID_FUNCTION_PUINT8_PFILE_POINTER UserFunction;
 };
 } // end namespace gdcm