Mercurial > hg > orthanc

diff Core/DicomParsing/FromDcmtkBridge.cpp @ 3448:b3bdd6dc10f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't change encoding of SpecificCharacterSet
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 25 Jun 2019 14:18:46 +0200
parents 8ed445e94486
children 33cfcc74d1b1
line wrap: on
line diff
--- a/Core/DicomParsing/FromDcmtkBridge.cpp	Tue Jun 25 12:15:03 2019 +0200
+++ b/Core/DicomParsing/FromDcmtkBridge.cpp	Tue Jun 25 14:18:46 2019 +0200
@@ -2312,8 +2312,15 @@
 
       if (c != NULL)  // This case corresponds to the empty string
       {
-        std::string s(c);
-        utf8 = Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions);
+        if (element.getTag() == DCM_SpecificCharacterSet)
+        {
+          utf8.assign(c);
+        }
+        else
+        {
+          std::string s(c);
+          utf8 = Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions);
+        }
       }
 
       std::string newValue;