Mercurial > hg > orthanc

comparison OrthancServer/ParsedDicomFile.cpp @ 1928:84c7eaeb5244

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configuration::GetDefaultEncoding
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 21 Mar 2016 14:12:31 +0100
parents 6c73df12ca51
children cda5b0ab4ce5
comparison
equal deleted inserted replaced
1927:b60f27664b8f 1928:84c7eaeb5244
1057 } 1057 }
1058 1058
1059 1059
1060 Encoding ParsedDicomFile::GetEncoding() const 1060 Encoding ParsedDicomFile::GetEncoding() const
1061 { 1061 {
1062 return FromDcmtkBridge::DetectEncoding(*pimpl_->file_->getDataset()); 1062 return FromDcmtkBridge::DetectEncoding(*pimpl_->file_->getDataset(),
1063 Configuration::GetDefaultEncoding());
1063 } 1064 }
1064 1065
1065 1066
1066 void ParsedDicomFile::SetEncoding(Encoding encoding) 1067 void ParsedDicomFile::SetEncoding(Encoding encoding)
1067 { 1068 {
1079 void ParsedDicomFile::ToJson(Json::Value& target, 1080 void ParsedDicomFile::ToJson(Json::Value& target,
1080 DicomToJsonFormat format, 1081 DicomToJsonFormat format,
1081 DicomToJsonFlags flags, 1082 DicomToJsonFlags flags,
1082 unsigned int maxStringLength) 1083 unsigned int maxStringLength)
1083 { 1084 {
1084 FromDcmtkBridge::ToJson(target, *pimpl_->file_->getDataset(), format, flags, maxStringLength); 1085 FromDcmtkBridge::ToJson(target, *pimpl_->file_->getDataset(),
1086 format, flags, maxStringLength,
1087 Configuration::GetDefaultEncoding());
1085 } 1088 }
1086 1089
1087 1090
1088 void ParsedDicomFile::HeaderToJson(Json::Value& target, 1091 void ParsedDicomFile::HeaderToJson(Json::Value& target,
1089 DicomToJsonFormat format) 1092 DicomToJsonFormat format)
1182 } 1185 }
1183 1186
1184 1187
1185 void ParsedDicomFile::Convert(DicomMap& tags) 1188 void ParsedDicomFile::Convert(DicomMap& tags)
1186 { 1189 {
1187 FromDcmtkBridge::Convert(tags, *pimpl_->file_->getDataset()); 1190 FromDcmtkBridge::Convert(tags, *pimpl_->file_->getDataset(),
1191 Configuration::GetDefaultEncoding());
1188 } 1192 }
1189 1193
1190 1194
1191 ParsedDicomFile* ParsedDicomFile::CreateFromJson(const Json::Value& json, 1195 ParsedDicomFile* ParsedDicomFile::CreateFromJson(const Json::Value& json,
1192 DicomFromJsonFlags flags) 1196 DicomFromJsonFlags flags)