X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FbaseFilterManualPaint.cpp;h=909db02c41aac42a13866dfa0ae4dc6c1570361c;hb=9a8f7c9cb08ffcb57f1558b9d20f7fbcd95df017;hp=3941e84f2b70fc06b6cf214ced36d1b929cff418;hpb=c6fea780dac325eca6315ac9b297080952e53589;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp index 3941e84..909db02 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp @@ -92,14 +92,26 @@ void baseFilterManualPaint::SetImages(vtkImageData *image, vtkImageData *image2) _image = image; _image2 = image2; int ext[6]; +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 _image->GetWholeExtent(ext); +#else + _image->GetExtent(ext); +#endif _minX = 0; _minY = 0; _minZ = 0; if (_image2!=NULL) { int extB[6]; + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 _image2->GetWholeExtent(extB); +#else + _image2->GetExtent(extB); +#endif + _maxX = std::min( ext[1]-ext[0] , extB[1]-extB[0] ); _maxY = std::min( ext[3]-ext[2] , extB[3]-extB[2] ); _maxZ = std::min( ext[5]-ext[4] , extB[5]-extB[4] );