X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkBinaryOperations.cxx;fp=packages%2Fvtk%2Fsrc%2FbbvtkBinaryOperations.cxx;h=106ceb27eb8c33530d01012d2f4e9c746fa2c363;hb=088ed2b7bdbe14eb85a7245afaa693ddb7a53a97;hp=f58c6ecd642af8bb16c110e4717fcb350b54d98a;hpb=79d06fa7c6441e99291ad3a1949d241f336573d5;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkBinaryOperations.cxx b/packages/vtk/src/bbvtkBinaryOperations.cxx
index f58c6ec..106ceb2 100644
--- a/packages/vtk/src/bbvtkBinaryOperations.cxx
+++ b/packages/vtk/src/bbvtkBinaryOperations.cxx
@@ -54,15 +54,25 @@ void BinaryOperations::Process()
 		return;
 	}
 
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 	ope->SetInput1((vtkDataObject*)bbGetInputIn1());
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+	ope->SetInput1Data((vtkDataObject*)bbGetInputIn1());
+#endif
 
 	if (bbGetInputIn2() != NULL)
 	{
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 		ope->SetInput2((vtkDataObject*)bbGetInputIn2());
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+		ope->SetInput2Data((vtkDataObject*)bbGetInputIn2());
+#endif
 
-	}
-	else
-	{
+	} else {
 	    std::cout << "Set In2" << std::endl;
         return;
 	}