Mercurial > hg > orthanc
diff Plugins/Samples/GdcmDecoder/GdcmImageDecoder.h @ 3915:7e33516965f8 transcoding
merging sample GDCM decoder and Orthanc Web viewer
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 11 May 2020 15:13:16 +0200 |
| parents | 94f4a18a79cc |
| children |
line wrap: on
line diff
--- a/Plugins/Samples/GdcmDecoder/GdcmImageDecoder.h Mon May 11 12:12:23 2020 +0200 +++ b/Plugins/Samples/GdcmDecoder/GdcmImageDecoder.h Mon May 11 15:13:16 2020 +0200 @@ -21,23 +21,13 @@ #pragma once -#include <orthanc/OrthancCPlugin.h> +#include "../Common/OrthancPluginCppWrapper.h" + #include <stdint.h> #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 @@ -60,7 +50,6 @@ static size_t GetBytesPerPixel(OrthancPluginPixelFormat format); - OrthancPluginImage* Decode(OrthancPluginContext* context, - unsigned int frameIndex) const; + OrthancPluginImage* Decode(unsigned int frameIndex) const; }; }