Mercurial > hg > orthanc
changeset 492:f3d4193c571a
switch to jsoncpp-0.6.0-rc2
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 17 Jul 2013 11:19:09 +0200 |
| parents | c56e9480183a |
| children | ff34c51cd3dd |
| files | Core/FileFormats/PngReader.cpp OrthancCppClient/OrthancConnection.cpp OrthancCppClient/Patient.cpp OrthancCppClient/Series.cpp OrthancCppClient/Study.cpp Resources/CMake/JsonCppConfiguration.cmake |
| diffstat | 6 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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 {
--- 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)
--- 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,
--- 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,
--- 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,
--- 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