X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkCreateImage.cxx;h=c534252a5b3452d7c440b579464a69e342790b80;hb=af00d6db1dc36f21081781f4c15e4762c2eb25b3;hp=c5f71b5fa96406085fd4901905d020c7d9025e90;hpb=a061a18c9335da6145bd87cc17f2572dce7ccab5;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkCreateImage.cxx b/packages/vtk/src/bbvtkCreateImage.cxx
index c5f71b5..c534252 100644
--- a/packages/vtk/src/bbvtkCreateImage.cxx
+++ b/packages/vtk/src/bbvtkCreateImage.cxx
@@ -56,6 +56,7 @@ void CreateImage::Process()
 	double	spc[3];
 	int		dim[3];	
 	int		outputformat = VTK_UNSIGNED_SHORT;
+	
 	if (bbGetInputOutputFormat()=="VTK_BIT")					outputformat = VTK_BIT;                 // 1
 	else if (bbGetInputOutputFormat()=="VTK_CHAR")				outputformat = VTK_CHAR;				// 2
 	else if (bbGetInputOutputFormat()=="MET_CHAR")				outputformat = VTK_CHAR;				// 2
@@ -78,6 +79,7 @@ void CreateImage::Process()
 	else if (bbGetInputOutputFormat()=="MET_FLOAT")				outputformat = VTK_FLOAT;               // 10
 	else if (bbGetInputOutputFormat()=="VTK_DOUBLE")			outputformat = VTK_DOUBLE;              // 11  		
 	else if (bbGetInputOutputFormat()=="MET_DOUBLE")			outputformat = VTK_DOUBLE;              // 11  
+
 	spc[0] = bbGetInputSpacing()[0];
 	spc[1] = bbGetInputSpacing()[1];
 	spc[2] = bbGetInputSpacing()[2];
@@ -97,33 +99,50 @@ void CreateImage::Process()
 		spc[2]=1;
 	}
 //EED 2017-12-7
-	if (imageoutput!=NULL) 
-	{
-		imageoutput->Delete();
-	}	
+	if (imageoutput!=NULL) {imageoutput->Delete();}	
 	imageoutput = vtkImageData::New();
 	imageoutput->Initialize();
-	imageoutput->SetScalarType( outputformat );	
 	imageoutput->SetSpacing( spc );
 	imageoutput->SetDimensions(  dim[0], dim[1], dim[2] );
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
+	imageoutput->SetScalarType( outputformat );	
 	imageoutput->AllocateScalars();
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+	imageoutput->AllocateScalars( outputformat,1 );
+#endif
+	
 	int i,j,k;
 	long sizeBlock;	
+
 	for (i=0; i<dim[0]; i++)
 	{
 		imageoutput->SetScalarComponentFromDouble(i,0,0, 0, bbGetInputInitialValue() );
-	}	
+	} // for i
+	
 	sizeBlock= dim[0] * imageoutput->GetScalarSize();
-            for (j=1; j<dim[1]; j++)
+    for (j=1; j<dim[1]; j++)
 	{
 		memcpy(  imageoutput->GetScalarPointer(0,j,0), imageoutput->GetScalarPointer()  , sizeBlock );
-	}		
+	} // for j		
+
 	sizeBlock= dim[0] * dim[1] * imageoutput->GetScalarSize();
 	for (k=0; k<dim[2]; k++)
 	{
 		memcpy(  imageoutput->GetScalarPointer(0,0,k) ,imageoutput->GetScalarPointer()  , sizeBlock );
 	} // for k
+	
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 	imageoutput->Update();
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+	// ..
+#endif
+
 	imageoutput->Modified();
 	bbSetOutputOut(imageoutput);
 }