Mercurial > hg > orthanc

diff Core/DicomParsing/FromDcmtkBridge.h @ 3217:cf8cbeb35f33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
preliminary support of Korean character set
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 13 Feb 2019 17:46:12 +0100
parents 4e43e67f8ecf
children 01a5b2530b68
line wrap: on
line diff
--- a/Core/DicomParsing/FromDcmtkBridge.h	Tue Feb 12 17:27:33 2019 +0100
+++ b/Core/DicomParsing/FromDcmtkBridge.h	Wed Feb 13 17:46:12 2019 +0100
@@ -92,6 +92,7 @@
                               DicomToJsonFlags flags,
                               unsigned int maxStringLength,
                               Encoding encoding,
+                              bool hasCodeExtensions,
                               const std::set<DicomTag>& ignoreTagLength);
 
     static void ElementToJson(Json::Value& parent,
@@ -100,6 +101,7 @@
                               DicomToJsonFlags flags,
                               unsigned int maxStringLength,
                               Encoding dicomEncoding,
+                              bool hasCodeExtensions,
                               const std::set<DicomTag>& ignoreTagLength);
 
     static void ExtractDicomAsJson(Json::Value& target, 
@@ -112,6 +114,7 @@
 
     static void ChangeStringEncoding(DcmItem& dataset,
                                      Encoding source,
+                                     bool hasSourceCodeExtensions,
                                      Encoding target);
 
   public:
@@ -124,7 +127,8 @@
                                       unsigned int maxMultiplicity,
                                       const std::string& privateCreator);
 
-    static Encoding DetectEncoding(DcmItem& dataset,
+    static Encoding DetectEncoding(bool& hasCodeExtensions,
+                                   DcmItem& dataset,
                                    Encoding defaultEncoding);
 
     static DicomTag Convert(const DcmTag& tag);
@@ -137,6 +141,7 @@
                                           DicomToJsonFlags flags,
                                           unsigned int maxStringLength,
                                           Encoding encoding,
+                                          bool hasCodeExtensions,
                                           const std::set<DicomTag>& ignoreTagLength);
 
     static void ExtractHeaderAsJson(Json::Value& target,