diff Framework/Inputs/DicomPyramid.cpp @ 62:f45cec2c32e2

Speed-up in the Web viewer plugin
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 25 Nov 2016 18:21:15 +0100
parents 147bd6dc28db
children d529d9ce3c7e
line wrap: on
line diff
--- a/Framework/Inputs/DicomPyramid.cpp	Fri Nov 25 17:15:55 2016 +0100
+++ b/Framework/Inputs/DicomPyramid.cpp	Fri Nov 25 18:21:15 2016 +0100
@@ -65,12 +65,14 @@
     Json::Value series;
     OrthancPlugins::IOrthancConnection::RestApiGet(series, orthanc_, "/series/" + seriesId);
 
-    if (series.type() != Json::objectValue)
+    if (series.type() != Json::objectValue ||
+        !series.isMember("Instances") ||
+        series["Instances"].type() != Json::arrayValue)
     {
       throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
     }
 
-    const Json::Value& instances = DicomToolbox::GetSequenceTag(series, "Instances");
+    const Json::Value& instances = series["Instances"];
     instances_.reserve(instances.size());
 
     for (Json::Value::ArrayIndex i = 0; i < instances.size(); i++)