result = vtkImageData::New();
if(numPixelsImg1<numPixelsImg2)
{
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
resample->SetInput(image1);
+#else
+ resample->SetInputData(image1);
+#endif
factorX = (double)extImg2[1]/extImg1[1];
factorY = (double)extImg2[3]/extImg1[3];
resample->SetAxisMagnificationFactor(0,factorX);
resample->SetAxisMagnificationFactor(1,factorY);
resample->SetInformationInput(image2);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+ resample->Update();
+#else
+ // ..
+#endif
initialize(dimImg2, spcImg2);
result = resample->GetOutput();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
result->Update();
+#else
+ // ..
+#endif
+
createImage(result,image2,dimImg2[0],dimImg2[1]);
} //if
else if (numPixelsImg1>numPixelsImg2)
{
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
resample->SetInput(image2);
+#else
+ resample->SetInputData(image2);
+#endif
factorX = (double)extImg1[1]/extImg2[1];
factorY = (double)extImg1[3]/extImg2[3];
resample->SetAxisMagnificationFactor(0,factorX);
resample->SetAxisMagnificationFactor(1,factorY);
resample->SetInformationInput(image1);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+ // ..
+#else
+ resample->Update();
+#endif
initialize(dimImg1, spcImg1);
result = resample->GetOutput();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
result->Update();
+#else
+ // ..
+#endif
createImage(image1,result,dimImg1[0],dimImg1[1]);
} // else if
{
//If both images have the same number of pixels, the resultant image will have the
//properties of the first image.
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
resample->SetInput(image2);
+#else
+ resample->SetInputData(image2);
+#endif
factorX = (double)extImg1[1]/extImg2[1];
factorY = (double)extImg1[3]/extImg2[3];
resample->SetAxisMagnificationFactor(0,factorX);
resample->SetAxisMagnificationFactor(1,factorY);
resample->SetInformationInput(image1);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+ // ..
+#else
+ resample->Update();
+#endif
initialize(dimImg1, spcImg1);
result = resample->GetOutput();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
result->Update();
+#else
+ //...
+#endif
createImage(image1,result,dimImg1[0],dimImg1[1]);
newImage->Delete();
}
newImage = vtkImageData::New();
- newImage->SetScalarType(type);
newImage->SetSpacing(spacing);
newImage->SetDimensions(dimensions);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+ newImage->SetScalarType(type);
newImage->AllocateScalars();
newImage->Update();
+#else
+ newImage->AllocateScalars(type,1);
+#endif
+
}
//------------------------------------------------------------
}
//std::cout << "The image has been checkboardized!" << std::endl;
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
newImage->Update();
+#else
+ newImage->Modified();
+#endif
+
// newImage->Modified();
}
/**Template used for the different image types