Skip to content

Commit

Permalink
Problem compiling with VTK 9.3.0 support
Browse files Browse the repository at this point in the history
With the following patch I succeded to build against VTK 9.3.0

Fixes #552
  • Loading branch information
nilason authored and malaterre committed Jun 18, 2024
1 parent de65084 commit 3be6c2f
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 45 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
1 change: 0 additions & 1 deletion Utilities/VTK/vtkGDCMTesting.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "vtkGDCMTesting.h"

#include "vtkObjectFactory.h"
#include "vtkToolkits.h"
#include "gdcmTesting.h"
#include "gdcmFilename.h"

Expand Down
28 changes: 0 additions & 28 deletions Utilities/VTK/vtkImageColorViewer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
16 changes: 0 additions & 16 deletions Utilities/VTK/vtkImageColorViewer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 3be6c2f

Please sign in to comment.