# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1349451913 -7200
# Node ID 7517cbe58623efb5dd9c29e7b048bb7160589d7c
# Parent  2d96cb181f45b8fab0045ab03cf509d160eb6111# Parent  52c7eb60bbc8638d3cb46b8a26932fcbc47bb651
merge

diff -r 2d96cb181f45 -r 7517cbe58623 OrthancServer/OrthancRestApi.cpp
--- a/OrthancServer/OrthancRestApi.cpp	Fri Oct 05 17:44:12 2012 +0200
+++ b/OrthancServer/OrthancRestApi.cpp	Fri Oct 05 17:45:13 2012 +0200
@@ -339,7 +339,7 @@
     else if (index_.GetSeries(found, postData))
     {
       // The UUID corresponds to a series
-      for (size_t i = 0; i < found["Instances"].size(); i++)
+      for (Json::Value::ArrayIndex i = 0; i < found["Instances"].size(); i++)
       {
         std::string uuid = found["Instances"][i].asString();
         Json::Value instance(Json::objectValue);
diff -r 2d96cb181f45 -r 7517cbe58623 Resources/CMake/JsonCppConfiguration.cmake
--- a/Resources/CMake/JsonCppConfiguration.cmake	Fri Oct 05 17:44:12 2012 +0200
+++ b/Resources/CMake/JsonCppConfiguration.cmake	Fri Oct 05 17:45:13 2012 +0200
@@ -4,6 +4,7 @@
     message(FATAL_ERROR "Please install the libjsoncpp-dev package")
   endif()
 
+  include_directories(/usr/include/jsoncpp)
   link_libraries(jsoncpp)
 
 else()