vtkImageData *result;
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->SetInformationInput(_image2);
initialize(dimImg2, spcImg2);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+ //..
+#else
+ resample->Update();
+#endif
+
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->SetInformationInput(_image1);
initialize(dimImg1, spcImg1);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+ // ...
+#else
+ resample->Update();
+#endif
result = resample->GetOutput();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
result->Update();
+#else
+ result->Modified();
+#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);
-
initialize(dimImg1, spcImg1);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+ // ...
+#else
+ resample->Update();
+#endif
result = resample->GetOutput();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
result->Update();
+#else
+ result->Modified();
+#endif
createImage(_image1,result,dimImg1[0],dimImg1[1]);
{
// Setting the new image
_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
+
}
createImageByType(dataImagePointer1, dataImagePointer2, dataImageResultPointer, img1, img2, sizeX, sizeY);
}
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
_newImage->Update();
+#else
+ _newImage->Modified();
+#endif
+
+
}
template <class T>