1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
From: Nicklas Larsson <n_larsson@yahoo.com>
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 7345372..c218aad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -704,6 +704,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 3d74802..a4e4ef1 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 909d21f..175d634 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 ad03feb..8542cd9 100644
--- a/Utilities/VTK/vtkImageColorViewer.h
+++ b/Utilities/VTK/vtkImageColorViewer.h
@@ -199,22 +199,6 @@ public:
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();
|
