Mercurial > hg > orthanc

comparison OrthancServer/FromDcmtkBridge.cpp @ 1691:e447f3cb8b30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 08 Oct 2015 10:53:14 +0200
parents ae09132e4237
children 558b25228a23
comparison
equal deleted inserted replaced
1690:ae09132e4237 1691:e447f3cb8b30
699 DcmElement& element, 699 DcmElement& element,
700 DicomToJsonFormat format, 700 DicomToJsonFormat format,
701 unsigned int maxStringLength, 701 unsigned int maxStringLength,
702 Encoding encoding) 702 Encoding encoding)
703 { 703 {
704 parent = Json::objectValue; 704 if (parent.type() == Json::nullValue)
705 {
706 parent = Json::objectValue;
707 }
708
709 assert(parent.type() == Json::objectValue);
705 Json::Value& target = PrepareNode(parent, element, format); 710 Json::Value& target = PrepareNode(parent, element, format);
706 711
707 if (element.isLeaf()) 712 if (element.isLeaf())
708 { 713 {
709 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement(element, encoding)); 714 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement(element, encoding));