X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.h;h=801df34055ee95535b9b496fe81c8619dc35894e;hb=2585af446cc22b6f697afbcd41f24cca810c3eb6;hp=d5b86bdb61883fb6e319d99b33ed25d76e364762;hpb=bc44a92d859676478ba1ad491d2a1d9256acb655;p=gdcm.git

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index d5b86bdb..801df340 100644
--- a/vtk/vtkGdcmReader.h
+++ b/vtk/vtkGdcmReader.h
@@ -1,8 +1,26 @@
-// vtkGdcmReader.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: vtkGdcmReader.h,v $
+  Language:  C++
+  Date:      $Date: 2005/04/28 09:29:05 $
+  Version:   $Revision: 1.21 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     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
 
+#include "gdcmCommon.h" // To avoid warnings concerning the std
+
 #include <vtkImageReader.h>
 #include <list>
 #include <string>
@@ -19,18 +37,20 @@ public:
    void PrintSelf(ostream& os, vtkIndent indent);
 
    virtual void RemoveAllFileName(void);
-   virtual void AddFileName(const char* name);
+   virtual void AddFileName(const char *name);
    virtual void SetFileName(const char *name);
+
+   void SetCheckFileCoherenceLight();
    
    // 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,int);
-   vtkGetMacro(AllowLookupTable,int);
-   vtkBooleanMacro(AllowLookupTable,int);
+   vtkSetMacro(AllowLookupTable, int);
+   vtkGetMacro(AllowLookupTable, int);
+   vtkBooleanMacro(AllowLookupTable, int);
 
-   vtkGetObjectMacro(LookupTable,vtkLookupTable);
+   vtkGetObjectMacro(LookupTable, vtkLookupTable);
 
 protected:
    vtkGdcmReader();
@@ -40,13 +60,14 @@ protected:
    virtual void ExecuteData(vtkDataObject *output);
    virtual void BuildFileListFromPattern();
    virtual int CheckFileCoherence();
+   virtual int CheckFileCoherenceLight();
 
 private:
    void RemoveAllInternalFileName(void);
    void AddInternalFileName(const char* name);
 
    //BTX
-   size_t LoadImageInMemory(std::string FileName, unsigned char * Dest,
+   size_t LoadImageInMemory(std::string FileName, unsigned char *Dest,
                            const unsigned long UpdateProgressTarget,
                            unsigned long & UpdateProgressCount);
    //ETX
@@ -55,6 +76,7 @@ private:
    vtkLookupTable *LookupTable;
    vtkTimeStamp fileTime;
    int AllowLookupTable;
+   bool LightChecking;
 
    //BTX
    // Number of columns of the image/volume to be loaded