X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvDeformableRegistration.cxx;h=12a2959aa33679b8ab5f6bde9349e0d859eeba5c;hb=2d5b3631dbb64aaf5868d90ac9b1006dd7f4dcef;hp=a4d36f1e63876a2cb6dc45daff869d906a222542;hpb=1e034c70105f0926939acaaa27ddb46e904ae8bf;p=clitk.git

diff --git a/vv/vvDeformableRegistration.cxx b/vv/vvDeformableRegistration.cxx
index a4d36f1..12a2959 100644
--- 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();
@@ -180,10 +185,10 @@ void vvDeformableRegistration::run()
     std::system(("rm " + output_filename).c_str());
     return;
   }
-  vvImageReader reader;
-  reader.SetInputFilename(output_filename);
-  reader.Update(VECTORFIELD);
+  vvImageReader::Pointer reader = vvImageReader::New();
+  reader->SetInputFilename(output_filename);
+  reader->Update(vvImageReader::VECTORFIELD);
   finish=clock();
   DD((finish - start)/static_cast<double>(CLOCKS_PER_SEC));
-  mOutput=reader.GetOutput();
+  mOutput = reader->GetOutput();
 }