From: jpr <jpr>
Date: Thu, 13 Dec 2007 16:18:13 +0000 (+0000)
Subject: Pàrt Mathieu's fix for vtk 4.2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b97a90517d5ccf28c3d22064727b3ad26be1c2d6;p=gdcm.git

Pàrt Mathieu's fix for vtk 4.2
( Gdcm ensures backward compatibility ( on vtk, NOT on gdcm :-( )
---

diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx
index 652d309c..a387d611 100644
--- a/vtk/vtkGdcmReader.cxx
+++ b/vtk/vtkGdcmReader.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkGdcmReader.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/10/03 15:49:51 $
-  Version:   $Revision: 1.93 $
+  Date:      $Date: 2007/12/13 16:18:13 $
+  Version:   $Revision: 1.94 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -92,7 +92,7 @@
 #include <vtkPointData.h>
 #include <vtkLookupTable.h>
 
-vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.93 $")
+vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.94 $")
 vtkStandardNewMacro(vtkGdcmReader)
 
 //-----------------------------------------------------------------------------
@@ -335,7 +335,9 @@ void vtkGdcmReader::ExecuteData(vtkDataObject *output)
 //}                           // end For VTK5.0
 
    data->AllocateScalars();  // For VTK5.0
-#if (VTK_MAJOR_VERSION >= 5)
+   
+#if (VTK_MAJOR_VERSION >= 5) || ( VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 2 )
+//#if (VTK_MAJOR_VERSION >= 5)
    if (this->UpdateExtentIsEmpty(output))
    {
       return;