Mercurial > hg > orthanc
diff Core/DicomParsing/FromDcmtkBridge.cpp @ 3209:f6374c36a671
documentation of DICOMweb in SDK, compatibility with DCMTK 3.6.0
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 08 Feb 2019 12:35:35 +0100 |
| parents | 9316f341e40f |
| children | cf8cbeb35f33 |
line wrap: on
line diff
--- a/Core/DicomParsing/FromDcmtkBridge.cpp Fri Feb 08 08:38:45 2019 +0100 +++ b/Core/DicomParsing/FromDcmtkBridge.cpp Fri Feb 08 12:35:35 2019 +0100 @@ -90,13 +90,16 @@ #include <dcmtk/dcmdata/dcvrss.h> #include <dcmtk/dcmdata/dcvrst.h> #include <dcmtk/dcmdata/dcvrtm.h> -#include <dcmtk/dcmdata/dcvruc.h> #include <dcmtk/dcmdata/dcvrui.h> #include <dcmtk/dcmdata/dcvrul.h> -#include <dcmtk/dcmdata/dcvrur.h> #include <dcmtk/dcmdata/dcvrus.h> #include <dcmtk/dcmdata/dcvrut.h> +#if DCMTK_VERSION_NUMBER >= 361 +# include <dcmtk/dcmdata/dcvruc.h> +# include <dcmtk/dcmdata/dcvrur.h> +#endif + #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1 # include <EmbeddedResources.h> #endif @@ -1461,11 +1464,15 @@ case EVR_PN: // person name return new DcmPersonName(key); +#if DCMTK_VERSION_NUMBER >= 361 case EVR_UC: // unlimited characters return new DcmUnlimitedCharacters(key); - +#endif + +#if DCMTK_VERSION_NUMBER >= 361 case EVR_UR: // URI/URL return new DcmUniversalResourceIdentifierOrLocator(key); +#endif /** @@ -1640,8 +1647,10 @@ case EVR_UT: // unlimited text case EVR_PN: // person name case EVR_UI: // unique identifier +#if DCMTK_VERSION_NUMBER >= 361 case EVR_UC: // unlimited characters case EVR_UR: // URI/URL +#endif { ok = element.putString(decoded->c_str()).good(); break;