ENH: update test for tesing MAC adrress

[gdcm.git] / src / gdcmPixelReadConvert.h

diff --git a/src/gdcmPixelReadConvert.h b/src/gdcmPixelReadConvert.h
index 29d895d15362d7ad59d1afda095a00820fa9d552..79d882a6564efda1c023be5782ed409eece8c69a 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: 2004/12/10 13:49:07 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2005/01/06 16:07:34 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,6 +21,7 @@
 #define GDCMPIXELREADCONVERT_H
 
 #include "gdcmCommon.h"
+#include "gdcmBase.h"
 #include "gdcmException.h"
 
 namespace gdcm
@@ -32,7 +33,7 @@ class JPEGFragmentsInfo;
  * \brief Utility container for gathering the various forms the pixel data
  *        migth take during the user demanded processes.
  */
-class GDCM_EXPORT PixelReadConvert
+class GDCM_EXPORT PixelReadConvert : public Base
 {
 public:
    PixelReadConvert();
@@ -48,6 +49,7 @@ public:
    //// Predicates:
    bool IsRawRGB();
 
+   void Print( std::ostream &os = std::cout );
    void Print( std::string indent = "", std::ostream &os = std::cout );
 
 // In progress
@@ -66,6 +68,11 @@ private:
    void ReadAndDecompress12BitsTo16Bits( std::ifstream* fp ) throw ( FormatError );
    bool ReadAndDecompressRLEFile( std::ifstream* fp );
    bool ReadAndDecompressJPEGFile( std::ifstream* fp );
+   bool ReadAndDecompressJPEGFramesFromFile( std::ifstream* fp );
+   bool ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream* fp );
+   bool ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream* fp );
+
+
    void BuildLUTRGBA( std::ifstream* fp );
 
    // In place (within Decompressed and with no fp access) decompression
@@ -86,11 +93,11 @@ private:
 // Variables
    /// Pixel data represented as RGB after LUT color interpretation.
    uint8_t* RGB;
-   /// Size of \ref RGB image.
+   /// Size of RGB image.
    size_t   RGBSize;
    /// Pixel data after decompression and bit/byte rearrangement.
    uint8_t* Raw;
-   /// Size of \ref Decompressed image.
+   /// 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 ).