X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.h;h=e9846b545bd746424dfcd72b0dd30c61bf6f7a75;hb=fb1db702e2e94adb9c04387604dbe635726db898;hp=864ea886afcb3d3d48406e401e420168a2996e26;hpb=ca1e16227a30bd895c6acdc27244c838f0631c2e;p=gdcm.git

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index 864ea886..e9846b54 100644
--- a/vtk/vtkGdcmReader.h
+++ b/vtk/vtkGdcmReader.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkGdcmReader.h,v $
   Language:  C++
-  Date:      $Date: 2009/11/03 14:05:23 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2011/03/31 12:37:54 $
+  Version:   $Revision: 1.40 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -14,8 +14,7 @@
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
-=========================================================================*/
-                                                                                
+==========================================================================*/
 #ifndef __vtkGdcmReader_h
 #define __vtkGdcmReader_h
 
@@ -46,7 +45,7 @@ public:
 
    //BTX
    void SetCoherentFileList( std::vector<GDCM_NAME_SPACE::File* > *cfl) {
-                                                      CoherentFileList = cfl; }    
+                             CoherentFileList = cfl; }
    //ETX
 
    //vtkSetMacro(AllowLightChecking, bool);
@@ -54,18 +53,18 @@ public:
    //vtkBooleanMacro(AllowLightChecking, bool);
 
    //BTX
-   
+
    /// \todo fix possible problems around VTK pipelining
-   
+
    void SetUserFunction (VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc )
                         { UserFunction = userFunc; } 
    //ETX
-  
+
    // Description:
    // If this flag is set and the DICOM reader encounters a dicom file with 
    // lookup table the data will be kept as unsigned chars and a lookuptable 
    // will be exported and accessible through GetLookupTable()
-   
+
    vtkSetMacro(AllowLookupTable, bool);
    vtkGetMacro(AllowLookupTable, bool);
    vtkBooleanMacro(AllowLookupTable, bool);
@@ -73,17 +72,17 @@ public:
    vtkSetMacro(KeepOverlays, bool);
    vtkGetMacro(KeepOverlays, bool);
    vtkBooleanMacro(KeepOverlays, bool);
- 
+
 //  Implementation note: when FileLowerLeft (gdcm2) is set to on the image is not flipped
 // upside down as VTK would expect, use this option only if you know what you are doing.   
   // vtkSetMacro(FileLowerLeft, bool);
   // vtkGetMacro(FileLowerLeft, bool);
   // vtkBooleanMacro(FileLowerLeft, bool);
-     
+
   vtkSetMacro(FlipY, bool);
   vtkGetMacro(FlipY, bool);
   vtkBooleanMacro(FlipY, bool);
-     
+
    vtkGetObjectMacro(LookupTable, vtkLookupTable);
 
 // FIXME : HOW to doxygen a VTK macro?
@@ -94,7 +93,7 @@ public:
  *        WARNING : before using NO_SHADOW, be sure *all* your files
  *        contain accurate values in the 0x0000 element (if any) 
  *        of *each* Shadow Group. The parser will fail if the size is wrong !
- * @param   mode Load mode to be used    
+ * @param   mode Load mode to be used
  */
    vtkSetMacro(LoadMode, int);
    vtkGetMacro(LoadMode, int);
@@ -103,11 +102,11 @@ public:
 /*
  * \ brief drop images with duplicate position  
  *         and therefore calculate ZSpacing for the whole file set
- * @param   mode user wants to drop images with duplicate position    
- */   
+ * @param   mode user wants to drop images with duplicate position
+ */
    vtkSetMacro(DropDuplicatePositions, bool);
    vtkGetMacro(DropDuplicatePositions, bool);
-   vtkBooleanMacro(DropDuplicatePositions, bool);      
+   vtkBooleanMacro(DropDuplicatePositions, bool);
 
 protected:
    vtkGdcmReader();
@@ -183,7 +182,7 @@ private:
    std::list<std::string> InternalFileNameList;
    gdcmFileList InternalFileList;
    //bool Execution;  // For VTK5.0
-  
+
    //ETX
 
    /// \brief Bit string integer (each one considered as a boolean)
@@ -199,6 +198,7 @@ private:
    
   // bool FileLowerLeft;
    bool FlipY;
+
    /// Pointer to a user suplied function to allow modification of pixel order
    VOID_FUNCTION_PUINT8_PFILE_POINTER UserFunction;
 
@@ -206,4 +206,3 @@ private:
 
 //-----------------------------------------------------------------------------
 #endif
-