Mercurial > hg > orthanc

diff 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
line wrap: on
line diff
--- a/OrthancServer/FromDcmtkBridge.cpp	Wed Oct 07 17:42:42 2015 +0200
+++ b/OrthancServer/FromDcmtkBridge.cpp	Thu Oct 08 10:53:14 2015 +0200
@@ -701,7 +701,12 @@
                                unsigned int maxStringLength,
                                Encoding encoding)
   {
-    parent = Json::objectValue;
+    if (parent.type() == Json::nullValue)
+    {
+      parent = Json::objectValue;
+    }
+
+    assert(parent.type() == Json::objectValue);
     Json::Value& target = PrepareNode(parent, element, format);
 
     if (element.isLeaf())