Mercurial > hg > orthanc
diff OrthancServer/FromDcmtkBridge.h @ 1934:72a2fd7fed8b
FromDcmtkBridge::FromJson
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 22 Mar 2016 15:11:53 +0100 |
parents | cda5b0ab4ce5 |
children | e251606c1433 |
line wrap: on
line diff
--- a/OrthancServer/FromDcmtkBridge.h Mon Mar 21 16:47:28 2016 +0100 +++ b/OrthancServer/FromDcmtkBridge.h Tue Mar 22 15:11:53 2016 +0100 @@ -54,7 +54,7 @@ unsigned int minMultiplicity, unsigned int maxMultiplicity); - static Encoding DetectEncoding(DcmDataset& dataset, + static Encoding DetectEncoding(DcmDataset & dataset, Encoding defaultEncoding); static void Convert(DicomMap& target, @@ -141,12 +141,20 @@ Encoding dicomEncoding); static DcmElement* FromJson(const DicomTag& tag, - const Json::Value& element, // Encoding using UTF-8 + const Json::Value& element, // Encoded using UTF-8 bool decodeDataUriScheme, Encoding dicomEncoding); static DcmEVR ParseValueRepresentation(const std::string& s); static DcmPixelSequence* GetPixelSequence(DcmDataset& dataset); + + static Encoding ExtractEncoding(const Json::Value& json, + Encoding defaultEncoding); + + static DcmDataset* FromJson(const Json::Value& json, // Encoded using UTF-8 + bool generateIdentifiers, + bool decodeDataUriScheme, + Encoding defaultEncoding); }; }