From: tbaudier Date: Fri, 7 Sep 2018 09:18:45 +0000 (+0200) Subject: Ensure compatibility with newer version of VTK9 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff_plain;h=b8e5890d37dfd64409b9694f73c0be164a089e64 Ensure compatibility with newer version of VTK9 --- diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx index e88a5d9..4e3ba21 100644 --- a/vv/vvMainWindow.cxx +++ b/vv/vvMainWindow.cxx @@ -3304,7 +3304,7 @@ void vvMainWindow::SaveScreenshotAllSlices() // Screenshot vtkSmartPointer windowToImageFilter = vtkSmartPointer::New(); windowToImageFilter->SetInput(renderWindow); -#if VTK_MAJOR_VERSION >= 8 && VTK_MINOR_VERSION >= 1 +#if (VTK_MAJOR_VERSION >= 8 && VTK_MINOR_VERSION >= 1) || VTK_MAJOR_VERSION >= 9 windowToImageFilter->SetScale(1); #else windowToImageFilter->SetMagnification(1); @@ -3358,7 +3358,7 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget) if (!fileName.isEmpty()) { vtkSmartPointer w2i = vtkSmartPointer::New(); w2i->SetInput(widget->GetRenderWindow()); -#if VTK_MAJOR_VERSION >= 8 && VTK_MINOR_VERSION >= 1 +#if (VTK_MAJOR_VERSION >= 8 && VTK_MINOR_VERSION >= 1) || VTK_MAJOR_VERSION >= 9 w2i->SetScale(1); #else w2i->SetMagnification(1);