#61 Remove undesired variable declaration in vvBinaryImageOverlayActor

[clitk.git] / vv / vvDeformableRegistration.cxx

diff --git a/vv/vvDeformableRegistration.cxx b/vv/vvDeformableRegistration.cxx
index 1586808ed1271ae624dda2d6e8471a456292ff35..12a2959aa33679b8ab5f6bde9349e0d859eeba5c 100644 (file)
--- a/vv/vvDeformableRegistration.cxx
+++ b/vv/vvDeformableRegistration.cxx
@@ -3,7 +3,7 @@
 
   Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #include <sstream>
 #include <cstdlib>
 #include <string>
@@ -27,6 +27,7 @@
 
 #include "vtkVOXImageWriter.h"
 #include <vtkImageData.h>
+#include <vtkVersion.h>
 
 #include "clitkCommon.h"
 #include "vvSlicerManager.h"
@@ -133,7 +134,11 @@ void vvDeformableRegistration::run()
   for (unsigned int i=0; i<images.size(); i++) {
     std::stringstream filename;
     filename << temp_dir << "/temp_" << i << ".vox";
+#if VTK_MAJOR_VERSION <= 5
     vox->SetInput(images[i]);
+#else
+    vox->SetInputData(images[i]);
+#endif
     vox->SetFileName(filename.str().c_str());
     if (i==refimage)
       ref_file=filename.str();
@@ -182,7 +187,7 @@ void vvDeformableRegistration::run()
   }
   vvImageReader::Pointer reader = vvImageReader::New();
   reader->SetInputFilename(output_filename);
-  reader->Update(VECTORFIELD);
+  reader->Update(vvImageReader::VECTORFIELD);
   finish=clock();
   DD((finish - start)/static_cast<double>(CLOCKS_PER_SEC));
   mOutput = reader->GetOutput();