#3219 creaMaracasVisu Feature New Normal - vtk8itk4wx3-mingw64

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
index 801078958158d57a1b217ec054d5fc78c39355d3..9dc9133a28248d8363998ca4f976543857d43b13 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
@@ -575,15 +575,12 @@ void ContourExtractData::InitVtkImagesResult()
                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 );
 
@@ -601,16 +598,12 @@ void ContourExtractData::InitVtkImagesResult()
                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 );