Mercurial > hg > orthanc

comparison OrthancServer/FromDcmtkBridge.cpp @ 1557:ad1e127b4ed5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix in encodings
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 20 Aug 2015 17:29:42 +0200
parents f967bdf8534e
children bd1889029cbb
comparison
equal deleted inserted replaced
1556:b8dc2f855a83 1557:ad1e127b4ed5
120 120
121 121
122 Encoding FromDcmtkBridge::DetectEncoding(DcmDataset& dataset) 122 Encoding FromDcmtkBridge::DetectEncoding(DcmDataset& dataset)
123 { 123 {
124 // By default, Latin1 encoding is assumed 124 // By default, Latin1 encoding is assumed
125 std::string s = Configuration::GetGlobalStringParameter("DefaultEncoding", ""); 125 std::string s = Configuration::GetGlobalStringParameter("DefaultEncoding", "Latin1");
126 Encoding encoding = s.empty() ? Encoding_Latin1 : StringToEncoding(s.c_str()); 126 Encoding encoding = s.empty() ? Encoding_Latin1 : StringToEncoding(s.c_str());
127 127
128 OFString tmp; 128 OFString tmp;
129 if (dataset.findAndGetOFString(DCM_SpecificCharacterSet, tmp).good()) 129 if (dataset.findAndGetOFString(DCM_SpecificCharacterSet, tmp).good())
130 { 130 {