# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1374052749 -7200
# Node ID f3d4193c571a981e399986636132ae5dd631bc47
# Parent  c56e9480183a9ddaa9b0838a4136d0b845017f96
switch to jsoncpp-0.6.0-rc2

diff -r c56e9480183a -r f3d4193c571a Core/FileFormats/PngReader.cpp
--- a/Core/FileFormats/PngReader.cpp	Tue Jul 16 16:09:17 2013 +0200
+++ b/Core/FileFormats/PngReader.cpp	Wed Jul 17 11:19:09 2013 +0200
@@ -36,6 +36,7 @@
 #include "../Toolbox.h"
 
 #include <png.h>
+#include <string.h>  // For memcpy()
 
 namespace Orthanc
 {
diff -r c56e9480183a -r f3d4193c571a OrthancCppClient/OrthancConnection.cpp
--- a/OrthancCppClient/OrthancConnection.cpp	Tue Jul 16 16:09:17 2013 +0200
+++ b/OrthancCppClient/OrthancConnection.cpp	Wed Jul 17 11:19:09 2013 +0200
@@ -48,7 +48,8 @@
 
   Orthanc::IDynamicObject* OrthancConnection::GetFillerItem(size_t index)
   {
-    return new Patient(*this, content_[index].asString());
+    Json::Value::ArrayIndex tmp = static_cast<Json::Value::ArrayIndex>(index);
+    return new Patient(*this, content_[tmp].asString());
   }
 
   Patient& OrthancConnection::GetPatient(unsigned int index)
diff -r c56e9480183a -r f3d4193c571a OrthancCppClient/Patient.cpp
--- a/OrthancCppClient/Patient.cpp	Tue Jul 16 16:09:17 2013 +0200
+++ b/OrthancCppClient/Patient.cpp	Wed Jul 17 11:19:09 2013 +0200
@@ -50,7 +50,8 @@
 
   Orthanc::IDynamicObject* Patient::GetFillerItem(size_t index)
   {
-    return new Study(connection_, patient_["Studies"][index].asString());
+    Json::Value::ArrayIndex tmp = static_cast<Json::Value::ArrayIndex>(index);
+    return new Study(connection_, patient_["Studies"][tmp].asString());
   }
 
   Patient::Patient(const OrthancConnection& connection,
diff -r c56e9480183a -r f3d4193c571a OrthancCppClient/Series.cpp
--- a/OrthancCppClient/Series.cpp	Tue Jul 16 16:09:17 2013 +0200
+++ b/OrthancCppClient/Series.cpp	Wed Jul 17 11:19:09 2013 +0200
@@ -215,7 +215,8 @@
 
   Orthanc::IDynamicObject* Series::GetFillerItem(size_t index)
   {
-    return new Instance(connection_, series_["Instances"][index].asString());
+    Json::Value::ArrayIndex tmp = static_cast<Json::Value::ArrayIndex>(index);
+    return new Instance(connection_, series_["Instances"][tmp].asString());
   }
 
   Series::Series(const OrthancConnection& connection,
diff -r c56e9480183a -r f3d4193c571a OrthancCppClient/Study.cpp
--- a/OrthancCppClient/Study.cpp	Tue Jul 16 16:09:17 2013 +0200
+++ b/OrthancCppClient/Study.cpp	Wed Jul 17 11:19:09 2013 +0200
@@ -50,7 +50,8 @@
 
   Orthanc::IDynamicObject* Study::GetFillerItem(size_t index)
   {
-    return new Series(connection_, study_["Series"][index].asString());
+    Json::Value::ArrayIndex tmp = static_cast<Json::Value::ArrayIndex>(index);
+    return new Series(connection_, study_["Series"][tmp].asString());
   }
 
   Study::Study(const OrthancConnection& connection,
diff -r c56e9480183a -r f3d4193c571a Resources/CMake/JsonCppConfiguration.cmake
--- a/Resources/CMake/JsonCppConfiguration.cmake	Tue Jul 16 16:09:17 2013 +0200
+++ b/Resources/CMake/JsonCppConfiguration.cmake	Wed Jul 17 11:19:09 2013 +0200
@@ -8,10 +8,10 @@
   link_libraries(jsoncpp)
 
 else()
-  SET(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-src-0.5.0)
+  SET(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-src-0.6.0-rc2)
   DownloadPackage(
-    "24482b67c1cb17aac1ed1814288a3a8f"
-    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/jsoncpp-src-0.5.0.tar.gz"
+    "363e2f4cbd3aeb63bf4e571f377400fb"
+    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/jsoncpp-src-0.6.0-rc2.tar.gz"
     "${JSONCPP_SOURCES_DIR}" "" "")
 
   list(APPEND THIRD_PARTY_SOURCES