# HG changeset patch # User Sebastien Jodogne # Date 1507632671 -7200 # Node ID 23f5ff059ce2d13f82d68cf10341df44174e94a6 # Parent 59b7aa77a8da53c551c57b8e5a09628a38194923 fix diff -r 59b7aa77a8da -r 23f5ff059ce2 Plugins/Samples/GdcmDecoder/GdcmImageDecoder.cpp --- a/Plugins/Samples/GdcmDecoder/GdcmImageDecoder.cpp Tue Oct 10 12:44:58 2017 +0200 +++ b/Plugins/Samples/GdcmDecoder/GdcmImageDecoder.cpp Tue Oct 10 12:51:11 2017 +0200 @@ -32,17 +32,6 @@ #include -// This is for compatibility with Orthanc SDK <= 1.3.0 -#if !defined(ORTHANC_PLUGINS_VERSION_IS_ABOVE) -#define ORTHANC_PLUGINS_VERSION_IS_ABOVE(major, minor, revision) \ - (ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER > major || \ - (ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER == major && \ - (ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER > minor || \ - (ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER == minor && \ - ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER >= revision)))) -#endif - - namespace OrthancPlugins { struct GdcmImageDecoder::PImpl diff -r 59b7aa77a8da -r 23f5ff059ce2 Plugins/Samples/GdcmDecoder/GdcmImageDecoder.h --- a/Plugins/Samples/GdcmDecoder/GdcmImageDecoder.h Tue Oct 10 12:44:58 2017 +0200 +++ b/Plugins/Samples/GdcmDecoder/GdcmImageDecoder.h Tue Oct 10 12:51:11 2017 +0200 @@ -26,6 +26,18 @@ #include #include + +// This is for compatibility with Orthanc SDK <= 1.3.0 +#if !defined(ORTHANC_PLUGINS_VERSION_IS_ABOVE) +#define ORTHANC_PLUGINS_VERSION_IS_ABOVE(major, minor, revision) \ + (ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER > major || \ + (ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER == major && \ + (ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER > minor || \ + (ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER == minor && \ + ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER >= revision)))) +#endif + + namespace OrthancPlugins { class GdcmImageDecoder : public boost::noncopyable