Mercurial > hg > orthanc
diff OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h @ 4297:785a2713323e
abi continued
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 05 Nov 2020 17:20:49 +0100 |
parents | 0ddc5297a8ab |
children | b2366bc023f8 |
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h Thu Nov 05 15:52:28 2020 +0100 +++ b/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h Thu Nov 05 17:20:49 2020 +0100 @@ -99,13 +99,9 @@ DcmItem& dataset, Encoding defaultEncoding); + // Compatibility wrapper for Orthanc <= 1.5.4 static Encoding DetectEncoding(DcmItem& dataset, - Encoding defaultEncoding) - { - // Compatibility wrapper for Orthanc <= 1.5.4 - bool hasCodeExtensions; // ignored - return DetectEncoding(hasCodeExtensions, dataset, defaultEncoding); - } + Encoding defaultEncoding); static DicomTag Convert(const DcmTag& tag); @@ -131,37 +127,21 @@ static std::string GetTagName(const DcmElement& element); - static std::string GetTagName(const DicomElement& element) - { - return GetTagName(element.GetTag(), ""); - } + static std::string GetTagName(const DicomElement& element); static DicomTag ParseTag(const char* name); - static DicomTag ParseTag(const std::string& name) - { - return ParseTag(name.c_str()); - } + static DicomTag ParseTag(const std::string& name); static bool HasTag(const DicomMap& fields, - const std::string& tagName) - { - return fields.HasTag(ParseTag(tagName)); - } + const std::string& tagName); static const DicomValue& GetValue(const DicomMap& fields, - const std::string& tagName) - { - return fields.GetValue(ParseTag(tagName)); - } + const std::string& tagName); static void SetValue(DicomMap& target, const std::string& tagName, - DicomValue* value) - { - const DicomTag tag = ParseTag(tagName); - target.SetValueInternal(tag.GetGroup(), tag.GetElement(), value); - } + DicomValue* value); static void ToJson(Json::Value& result, const DicomMap& values,