imagedataValueResult->Delete();
}
imagedataValueResult = vtkImageData::New();
-<<<<<<< HEAD
- // imagedataValueResult->SetScalarType(scalartype);
-=======
-
-//EED 2017-12-18
- imagedataValueResult->SetScalarType(scalartype);
- //imagedataValueResult->SetScalarTypeToUnsignedShort();
-
->>>>>>> master
imagedataValueResult->SetSpacing(spc);
imagedataValueResult->SetDimensions( newDim );
//EED 2017-01-01 Migration VTK7
#if VTK_MAJOR_VERSION <= 5
- imagedataValueResult->SetScalarTypeToUnsignedShort();
+
+//EED 2017-12-18
+ imagedataValueResult->SetScalarType(scalartype);
+ //imagedataValueResult->SetScalarTypeToUnsignedShort();
imagedataValueResult->AllocateScalars();
#else
- imagedataValueResult->AllocateScalars(VTK_UNSIGNED_SHORT,1);
+ imagedataValueResult->AllocateScalars(scalartype,1);
#endif
imagedataMaskResult->Delete();
}
imagedataMaskResult = vtkImageData::New();
-<<<<<<< HEAD
- // imagedataMaskResult->SetScalarType(scalartype);
-=======
-//EED 2017-12-18
-// imagedataMaskResult->SetScalarType(scalartype);
-// imagedataMaskResult->SetScalarTypeToUnsignedShort();
- imagedataMaskResult->SetScalarTypeToUnsignedChar();
->>>>>>> master
imagedataMaskResult->SetSpacing(spc);
imagedataMaskResult->SetDimensions( newDim );
//EED 2017-01-01 Migration VTK7
#if VTK_MAJOR_VERSION <= 5
- imagedataMaskResult->SetScalarTypeToUnsignedShort();
+ //EED 2017-12-18
+ //imagedataMaskResult->SetScalarTypeToUnsignedShort();
+ imagedataMaskResult->SetScalarTypeToUnsignedChar();
imagedataMaskResult->AllocateScalars();
#else
- imagedataMaskResult->AllocateScalars(VTK_UNSIGNED_SHORT,1);
+ imagedataMaskResult->AllocateScalars(VTK_UNSIGNED_CHAR,1);
#endif
}