Replace

void SetCheckFileCoherenceLight();
by
vtkSetMacro(AllowLightChecking, int);
vtkGetMacro(AllowLightChecking, int);
vtkBooleanMacro(AllowLightChecking, int);
to be vtk compliant

diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx
index 40c592dcdbd3d6bd3a35c805b74ed7072e765972..e46553e72108d440bd70a930a17dff63cb9f93ce 100644 (file)
--- a/vtk/vtkGdcmReader.cxx
+++ b/vtk/vtkGdcmReader.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkGdcmReader.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/20 22:29:46 $
-  Version:   $Revision: 1.75 $
+  Date:      $Date: 2005/08/22 12:30:36 $
+  Version:   $Revision: 1.76 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -122,7 +122,7 @@
 #include <vtkPointData.h>
 #include <vtkLookupTable.h>
 
-vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.75 $")
+vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.76 $")
 vtkStandardNewMacro(vtkGdcmReader)
 
 //-----------------------------------------------------------------------------
@@ -131,7 +131,7 @@ vtkGdcmReader::vtkGdcmReader()
 {
    this->LookupTable = NULL;
    this->AllowLookupTable = 0;
-   this->LightChecking = false;
+   this->AllowLightChecking = 0;
    this->LoadMode = 0; // Load everything (possible values : NO_SEQ, NO_SHADOW,
                        //                                    NO_SHADOWSEQ)
    this->CoherentFileList = 0;
@@ -204,10 +204,10 @@ void vtkGdcmReader::SetFileName(const char *name)
  * Ask for a 'light' checking -actually : just initializing-
  *if you are 150% sure *all* the files are coherent
  */
-void vtkGdcmReader::SetCheckFileCoherenceLight()
-{
-   LightChecking = true;
-}
+//void vtkGdcmReader::SetCheckFileCoherenceLight()
+//{
+//   LightChecking = true;
+//}
 
 //-----------------------------------------------------------------------------
 // Protected
@@ -220,7 +220,7 @@ void vtkGdcmReader::ExecuteInformation()
    {
       if ( this->CoherentFileList != 0 )
          this->TotalNumberOfPlanes = this->CheckFileCoherenceAlreadyDone();  
-      else if ( this->LightChecking )
+      else if ( this->AllowLightChecking )
          this->TotalNumberOfPlanes = this->CheckFileCoherenceLight();
       else
           this->TotalNumberOfPlanes = this->CheckFileCoherence();

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index ba30d132ff6dcf26c01edd8e3194361d2bc0b58c..73386ba36e87936e2a523260ab9c1fd64b004aab 100644 (file)
--- a/vtk/vtkGdcmReader.h
+++ b/vtk/vtkGdcmReader.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkGdcmReader.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/30 18:31:25 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2005/08/22 12:30:36 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -45,7 +45,11 @@ public:
    virtual void SetFileName(const char *name);
    void SetCoherentFileList( std::vector<gdcm::File* > *cfl) {
                                                       CoherentFileList = cfl; }    
-   void SetCheckFileCoherenceLight();
+   //void SetCheckFileCoherenceLight();
+   vtkSetMacro(AllowLightChecking, int);
+   vtkGetMacro(AllowLightChecking, int);
+   vtkBooleanMacro(AllowLightChecking, int);
+
    void SetUserFunction (VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc )
                         { UserFunction = userFunc; }   
    // Description:
@@ -101,7 +105,8 @@ private:
    vtkLookupTable *LookupTable;
    vtkTimeStamp fileTime;
    int AllowLookupTable;
-   bool LightChecking;
+
+   int AllowLightChecking;
 
    //BTX
    // Number of columns of the image/volume to be loaded