Mercurial > hg > orthanc
changeset 2426:23f5ff059ce2
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 10 Oct 2017 12:51:11 +0200 |
| parents | 59b7aa77a8da |
| children | 715476b5d671 |
| files | Plugins/Samples/GdcmDecoder/GdcmImageDecoder.cpp Plugins/Samples/GdcmDecoder/GdcmImageDecoder.h |
| diffstat | 2 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- 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 <boost/iostreams/device/array.hpp> -// 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
--- 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 <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> + +// 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