From 3be6c2fa0945c91889bcf06e8c20e88f69692dd5 Mon Sep 17 00:00:00 2001 From: Nicklas Larsson Date: Tue, 18 Jun 2024 08:06:20 +0200 Subject: [PATCH] Problem compiling with VTK 9.3.0 support With the following patch I succeded to build against VTK 9.3.0 Fixes #552 --- CMakeLists.txt | 1 + Utilities/VTK/vtkGDCMTesting.cxx | 1 - Utilities/VTK/vtkImageColorViewer.cxx | 28 --------------------------- Utilities/VTK/vtkImageColorViewer.h | 16 --------------- 4 files changed, 1 insertion(+), 45 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1083c5fcd..758a60e68d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -707,6 +707,7 @@ if(GDCM_STANDALONE) HEADERS_DESTINATION "${GDCM_INSTALL_INCLUDE_DIR}/vtk${vtk_version_suffix}" CMAKE_DESTINATION "${GDCM_INSTALL_PACKAGE_DIR}" LICENSE_DESTINATION "${GDCM_INSTALL_DATA_DIR}/vtkgdcm-${GDCM_SHORT_VERSION}" + SPDX_DESTINATION "${GDCM_INSTALL_DATA_DIR}/vtkgdcm-${GDCM_SHORT_VERSION}" HIERARCHY_DESTINATION "${GDCM_INSTALL_LIB_DIR}/vtk${vtk_version_suffix}/hierarchy/vtkgdcm" LIBRARY_NAME_SUFFIX "${vtkgdcm_library_suffix}" VERSION "${GDCM_VERSION}" diff --git a/Utilities/VTK/vtkGDCMTesting.cxx b/Utilities/VTK/vtkGDCMTesting.cxx index 3d74802f0a..a4e4ef1f23 100644 --- a/Utilities/VTK/vtkGDCMTesting.cxx +++ b/Utilities/VTK/vtkGDCMTesting.cxx @@ -14,7 +14,6 @@ #include "vtkGDCMTesting.h" #include "vtkObjectFactory.h" -#include "vtkToolkits.h" #include "gdcmTesting.h" #include "gdcmFilename.h" diff --git a/Utilities/VTK/vtkImageColorViewer.cxx b/Utilities/VTK/vtkImageColorViewer.cxx index 909d21fceb..175d634e46 100644 --- a/Utilities/VTK/vtkImageColorViewer.cxx +++ b/Utilities/VTK/vtkImageColorViewer.cxx @@ -918,34 +918,6 @@ void vtkImageColorViewer::SetOverlayVisibility(double vis) this->OverlayImageActor->SetVisibility((int)vis); } -//---------------------------------------------------------------------------- -#ifndef VTK_LEGACY_REMOVE -int vtkImageColorViewer::GetWholeZMin() -{ - VTK_LEGACY_REPLACED_BODY(vtkImageColorViewer::GetWholeZMin, "VTK 5.0", - vtkImageColorViewer::GetSliceMin); - return this->GetSliceMin(); -} -int vtkImageColorViewer::GetWholeZMax() -{ - VTK_LEGACY_REPLACED_BODY(vtkImageColorViewer::GetWholeZMax, "VTK 5.0", - vtkImageColorViewer::GetSliceMax); - return this->GetSliceMax(); -} -int vtkImageColorViewer::GetZSlice() -{ - VTK_LEGACY_REPLACED_BODY(vtkImageColorViewer::GetZSlice, "VTK 5.0", - vtkImageColorViewer::GetSlice); - return this->GetSlice(); -} -void vtkImageColorViewer::SetZSlice(int s) -{ - VTK_LEGACY_REPLACED_BODY(vtkImageColorViewer::SetZSlice, "VTK 5.0", - vtkImageColorViewer::SetSlice); - this->SetSlice(s); -} -#endif - //---------------------------------------------------------------------------- void vtkImageColorViewer::PrintSelf(ostream& os, vtkIndent indent) { diff --git a/Utilities/VTK/vtkImageColorViewer.h b/Utilities/VTK/vtkImageColorViewer.h index ad03febb0d..8542cd99c9 100644 --- a/Utilities/VTK/vtkImageColorViewer.h +++ b/Utilities/VTK/vtkImageColorViewer.h @@ -199,22 +199,6 @@ class VTKGDCM_EXPORT vtkImageColorViewer : public vtkObject virtual int GetOffScreenRendering(); vtkBooleanMacro(OffScreenRendering,int); - // Description: - // @deprecated Replaced by vtkImageColorViewer::GetSliceMin() as of VTK 5.0. - VTK_LEGACY(int GetWholeZMin()); - - // Description: - // @deprecated Replaced by vtkImageColorViewer::GetSliceMax() as of VTK 5.0. - VTK_LEGACY(int GetWholeZMax()); - - // Description: - // @deprecated Replaced by vtkImageColorViewer::GetSlice() as of VTK 5.0. - VTK_LEGACY(int GetZSlice()); - - // Description: - // @deprecated Replaced by vtkImageColorViewer::SetSlice() as of VTK 5.0. - VTK_LEGACY(void SetZSlice(int)); - protected: vtkImageColorViewer(); ~vtkImageColorViewer();