From b97a90517d5ccf28c3d22064727b3ad26be1c2d6 Mon Sep 17 00:00:00 2001 From: jpr Date: Thu, 13 Dec 2007 16:18:13 +0000 Subject: [PATCH] =?utf8?q?P=E0rt=20Mathieu's=20fix=20for=20vtk=204.2=20(?= =?utf8?q?=20Gdcm=20ensures=20backward=20compatibility=20(=20on=20vtk,=20N?= =?utf8?q?OT=20on=20gdcm=20:-(=20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- vtk/vtkGdcmReader.cxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 #include -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; -- 2.45.1