Skip to content

Commit 6e14aad

Browse files
committed
COMP: Update GDCM system version check for SetSecondaryCaptureImagePlaneModule
Follow up #4601 GDCM master is currently at version 3.1.0. Updated check to include versions 3.1+.
1 parent 32e1309 commit 6e14aad

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Modules/IO/GDCM/src/itkGDCMImageIO.cxx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,9 @@ GDCMImageIO::Read(void * pointer)
281281

282282
itkAssertInDebugAndIgnoreInReleaseMacro(gdcm::ImageHelper::GetForceRescaleInterceptSlope());
283283
// Only available in newer versions
284-
#if (!defined(ITK_USE_SYSTEM_GDCM) || \
285-
((GDCM_MAJOR_VERSION == 3 && GDCM_MINOR_VERSION == 0 && GDCM_BUILD_VERSION > 23) || GDCM_MAJOR_VERSION > 3))
284+
#if (!defined(ITK_USE_SYSTEM_GDCM) || \
285+
((GDCM_MAJOR_VERSION == 3 && GDCM_MINOR_VERSION == 0 && GDCM_BUILD_VERSION > 23) || \
286+
(GDCM_MAJOR_VERSION == 3 && GDCM_MINOR_VERSION > 0) || GDCM_MAJOR_VERSION > 3))
286287
// Secondary capture image orientation patient and image position patient support
287288
itkAssertInDebugAndIgnoreInReleaseMacro(gdcm::ImageHelper::GetSecondaryCaptureImagePlaneModule());
288289
#endif
@@ -455,8 +456,9 @@ GDCMImageIO::InternalReadImageInformation()
455456
// In general this should be relatively safe to assume
456457
gdcm::ImageHelper::SetForceRescaleInterceptSlope(true);
457458
// Only available in newer versions
458-
#if (!defined(ITK_USE_SYSTEM_GDCM) || \
459-
((GDCM_MAJOR_VERSION == 3 && GDCM_MINOR_VERSION == 0 && GDCM_BUILD_VERSION > 23) || GDCM_MAJOR_VERSION > 3))
459+
#if (!defined(ITK_USE_SYSTEM_GDCM) || \
460+
((GDCM_MAJOR_VERSION == 3 && GDCM_MINOR_VERSION == 0 && GDCM_BUILD_VERSION > 23) || \
461+
(GDCM_MAJOR_VERSION == 3 && GDCM_MINOR_VERSION > 0) || GDCM_MAJOR_VERSION > 3))
460462
// Secondary capture image orientation patient and image position patient support
461463
gdcm::ImageHelper::SetSecondaryCaptureImagePlaneModule(true);
462464
#endif

0 commit comments

Comments
 (0)