Skip to content

Commit

Permalink
COMP: Update GDCM system version check for SetSecondaryCaptureImagePl…
Browse files Browse the repository at this point in the history
…aneModule

Follow up #4601
GDCM master is currently at version 3.1.0. Updated check to include versions 3.1+.
  • Loading branch information
issakomi committed Apr 24, 2024
1 parent 32e1309 commit 6e14aad
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Modules/IO/GDCM/src/itkGDCMImageIO.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,9 @@ GDCMImageIO::Read(void * pointer)

itkAssertInDebugAndIgnoreInReleaseMacro(gdcm::ImageHelper::GetForceRescaleInterceptSlope());
// Only available in newer versions
#if (!defined(ITK_USE_SYSTEM_GDCM) || \
((GDCM_MAJOR_VERSION == 3 && GDCM_MINOR_VERSION == 0 && GDCM_BUILD_VERSION > 23) || GDCM_MAJOR_VERSION > 3))
#if (!defined(ITK_USE_SYSTEM_GDCM) || \
((GDCM_MAJOR_VERSION == 3 && GDCM_MINOR_VERSION == 0 && GDCM_BUILD_VERSION > 23) || \
(GDCM_MAJOR_VERSION == 3 && GDCM_MINOR_VERSION > 0) || GDCM_MAJOR_VERSION > 3))
// Secondary capture image orientation patient and image position patient support
itkAssertInDebugAndIgnoreInReleaseMacro(gdcm::ImageHelper::GetSecondaryCaptureImagePlaneModule());
#endif
Expand Down Expand Up @@ -455,8 +456,9 @@ GDCMImageIO::InternalReadImageInformation()
// In general this should be relatively safe to assume
gdcm::ImageHelper::SetForceRescaleInterceptSlope(true);
// Only available in newer versions
#if (!defined(ITK_USE_SYSTEM_GDCM) || \
((GDCM_MAJOR_VERSION == 3 && GDCM_MINOR_VERSION == 0 && GDCM_BUILD_VERSION > 23) || GDCM_MAJOR_VERSION > 3))
#if (!defined(ITK_USE_SYSTEM_GDCM) || \
((GDCM_MAJOR_VERSION == 3 && GDCM_MINOR_VERSION == 0 && GDCM_BUILD_VERSION > 23) || \
(GDCM_MAJOR_VERSION == 3 && GDCM_MINOR_VERSION > 0) || GDCM_MAJOR_VERSION > 3))
// Secondary capture image orientation patient and image position patient support
gdcm::ImageHelper::SetSecondaryCaptureImagePlaneModule(true);
#endif
Expand Down

0 comments on commit 6e14aad

Please sign in to comment.