Mercurial > hg > orthanc

comparison OrthancServer/ParsedDicomFile.cpp @ 1929:cda5b0ab4ce5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ORTHANC_MAXIMUM_TAG_LENGTH made explicit
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 21 Mar 2016 14:28:59 +0100
parents 84c7eaeb5244
children 72a2fd7fed8b
comparison
equal deleted inserted replaced
1928:84c7eaeb5244 1929:cda5b0ab4ce5
771 { 771 {
772 return false; 772 return false;
773 } 773 }
774 774
775 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement 775 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement
776 (*element, DicomToJsonFlags_Default, GetEncoding())); 776 (*element, DicomToJsonFlags_Default,
777 ORTHANC_MAXIMUM_TAG_LENGTH, GetEncoding()));
777 778
778 if (v.get() == NULL || 779 if (v.get() == NULL ||
779 v->IsNull()) 780 v->IsNull())
780 { 781 {
781 value = ""; 782 value = "";
1185 } 1186 }
1186 1187
1187 1188
1188 void ParsedDicomFile::Convert(DicomMap& tags) 1189 void ParsedDicomFile::Convert(DicomMap& tags)
1189 { 1190 {
1190 FromDcmtkBridge::Convert(tags, *pimpl_->file_->getDataset(), 1191 FromDcmtkBridge::Convert(tags, *pimpl_->file_->getDataset(),
1192 ORTHANC_MAXIMUM_TAG_LENGTH,
1191 Configuration::GetDefaultEncoding()); 1193 Configuration::GetDefaultEncoding());
1192 } 1194 }
1193 1195
1194 1196
1195 ParsedDicomFile* ParsedDicomFile::CreateFromJson(const Json::Value& json, 1197 ParsedDicomFile* ParsedDicomFile::CreateFromJson(const Json::Value& json,