Merge branch 'master' into clitkImage2Dicom

[clitk.git] / tools / clitkDicom2Image.cxx

diff --git a/tools/clitkDicom2Image.cxx b/tools/clitkDicom2Image.cxx
index 6f36bc07d2062dcb0c0cfe6db136bb97c9d8d3f8..a6323da9de5ba6ad89c75ab8372049ef569b3200 100644 (file)
--- a/tools/clitkDicom2Image.cxx
+++ b/tools/clitkDicom2Image.cxx
@@ -23,6 +23,7 @@
 #include "vvImageReader.h"
 #include "vvImageWriter.h"
 #include <gdcmFile.h>
+#include <vtkVersion.h>
 #include <vtkImageChangeInformation.h>
 #if GDCM_MAJOR_VERSION == 2
   #include <gdcmImageHelper.h>
@@ -191,7 +192,11 @@ int main(int argc, char * argv[])
       std::vector<int> size = image->GetSize();
       origin[0] = -spacing[0]*size[0]/2.0;
       origin[1] = -spacing[1]*size[1]/2.0;
+#if VTK_MAJOR_VERSION <= 5
       modifier->SetInput(vtk_image);
+#else
+      modifier->SetInputData(vtk_image);
+#endif
       modifier->SetOutputOrigin(origin[0], origin[1], locs[sliceIndex[0]]);
       modifier->Update();
       vvImage::Pointer focal_image = vvImage::New();
@@ -207,7 +212,6 @@ int main(int argc, char * argv[])
       name << *sn << "_" << args_info.output_arg;
       outfile = name.str();
     }
-    DD("before write");
     vvImageWriter::Pointer writer = vvImageWriter::New();
     writer->SetInput(image);
     writer->SetOutputFileName(outfile);