X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.h;h=62856a86bddd46caf1d06381b5ceae3621e77acb;hb=76ac46b16fd92d0fb444f786d4946424d9029315;hp=368b024830adf825326f50f26b08c455df9e5555;hpb=906464b1c71b1b623f8202a693e75a358a5bd965;p=gdcm.git

diff --git a/src/gdcmPixelReadConvert.h b/src/gdcmPixelReadConvert.h
index 368b0248..62856a86 100644
--- a/src/gdcmPixelReadConvert.h
+++ b/src/gdcmPixelReadConvert.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.h,v $
   Language:  C++
-  Date:      $Date: 2006/02/16 20:06:15 $
-  Version:   $Revision: 1.29 $
+  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,8 +17,8 @@
 =========================================================================*/
 
 
-#ifndef GDCMPIXELREADCONVERT_H
-#define GDCMPIXELREADCONVERT_H
+#ifndef _GDCMPIXELREADCONVERT_H_
+#define _GDCMPIXELREADCONVERT_H_
 
 #include "gdcmBase.h"
 #include "gdcmFileHelper.h"
@@ -27,7 +27,7 @@
 
 #include <fstream>
 
-namespace gdcm
+namespace GDCM_NAME_SPACE
 {
 class File;
 class RLEFramesInfo;
@@ -77,11 +77,11 @@ private:
    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 );
 
@@ -102,7 +102,7 @@ private:
    void CallStartMethod();
    void CallProgressMethod();
    void CallEndMethod();
-   
+
 // Variables
 /**
  * \brief Pixel data represented as RGB after LUT color interpretation.
@@ -117,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;
@@ -130,6 +130,7 @@ private:
    int XSize;
    int YSize;
    int ZSize;
+   int TSize;
    int BitsAllocated;
    int BitsStored;
    int HighBitPosition;