X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkImageVtkProperties.cxx;h=50506435bc6026d0c686b66b98c97fd684551874;hb=b5d2eb7c48011dfed815c80c3bb460ff9bee27f4;hp=9a8b563f68715fd7f628bbe54022e039e467d15e;hpb=0dde94ea04d1505b73e3b57bb3d736363104642f;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkImageVtkProperties.cxx b/packages/vtk/src/bbvtkImageVtkProperties.cxx
index 9a8b563..5050643 100644
--- a/packages/vtk/src/bbvtkImageVtkProperties.cxx
+++ b/packages/vtk/src/bbvtkImageVtkProperties.cxx
@@ -50,10 +50,19 @@ void ImageVtkProperties::Process()
 	std::vector<float> vspacing;
 	std::vector<float> vrange;
 
-	if ( bbGetInputIn() ){
-		bbGetInputIn()->Update();
+	if ( bbGetInputIn() )
+	{
+		bbGetInputIn()->Modified();
 		
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
+		bbGetInputIn()->Update();
 		bbGetInputIn()->GetWholeExtent(ext);
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+		bbGetInputIn()->GetExtent(ext);
+#endif
+
 		vsize.push_back(ext[1]-ext[0]+1);
 		vsize.push_back(ext[3]-ext[2]+1);
 		vsize.push_back(ext[5]-ext[4]+1);
@@ -68,23 +77,25 @@ void ImageVtkProperties::Process()
 	
 		bbGetInputIn()->GetSpacing(spc);
 		for (unsigned int i=0;i<dim;++i) 
+		{
 			vspacing.push_back((float)spc[i]);
+		}
 
 		vrange.push_back((float)range[0]);
 		vrange.push_back((float)range[1]);
 
-		if (bbGetInputIn()->GetScalarType()==VTK_BIT)			nametype="VTK_BIT";  		// 1
-		if (bbGetInputIn()->GetScalarType()==VTK_CHAR)			nametype="VTK_CHAR"; 		// 2
+		if (bbGetInputIn()->GetScalarType()==VTK_BIT)				nametype="VTK_BIT";  			// 1
+		if (bbGetInputIn()->GetScalarType()==VTK_CHAR)				nametype="VTK_CHAR"; 			// 2
 		if (bbGetInputIn()->GetScalarType()==VTK_SIGNED_CHAR)		nametype="VTK_SIGNED_CHAR";  	// 15
 		if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_CHAR)		nametype="VTK_UNSIGNED_CHAR";	// 3
-		if (bbGetInputIn()->GetScalarType()==VTK_SHORT)			nametype="VTK_SHORT"; 		// 4
+		if (bbGetInputIn()->GetScalarType()==VTK_SHORT)				nametype="VTK_SHORT"; 			// 4
 		if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_SHORT)	nametype="VTK_UNSIGNED_SHORT";  // 5
-		if (bbGetInputIn()->GetScalarType()==VTK_INT)			nametype="VTK_INT";             // 6
+		if (bbGetInputIn()->GetScalarType()==VTK_INT)				nametype="VTK_INT";             // 6
 		if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_INT)		nametype="VTK_UNSIGNED_INT";    // 7
-		if (bbGetInputIn()->GetScalarType()==VTK_LONG)			nametype="VTK_LONG";            // 8  
+		if (bbGetInputIn()->GetScalarType()==VTK_LONG)				nametype="VTK_LONG";            // 8  
 		if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_LONG)		nametype="VTK_UNSIGNED_LONG";   // 9
-		if (bbGetInputIn()->GetScalarType()==VTK_FLOAT)			nametype="VTK_FLOAT";           // 10
-		if (bbGetInputIn()->GetScalarType()==VTK_DOUBLE)		nametype="VTK_DOUBLE";          // 11
+		if (bbGetInputIn()->GetScalarType()==VTK_FLOAT)				nametype="VTK_FLOAT";           // 10
+		if (bbGetInputIn()->GetScalarType()==VTK_DOUBLE)			nametype="VTK_DOUBLE";          // 11
 	} else {	
 		dim					= 0;		
 		numberoOfComponents	= 0;