Mercurial > hg > orthanc-stone
comparison OrthancStone/Sources/Toolbox/OrthancDatasets/IOrthancConnection.cpp @ 1737:ef2f56c0311c
remove calls to deprecated classes of JsonCpp
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 22 Dec 2020 09:16:42 +0100 |
parents | 8563ea5d8ae4 |
children | 9ac2a65d4172 |
comparison
equal
deleted
inserted
replaced
1736:77038e2bd074 | 1737:ef2f56c0311c |
---|---|
21 | 21 |
22 | 22 |
23 #include "IOrthancConnection.h" | 23 #include "IOrthancConnection.h" |
24 | 24 |
25 #include <OrthancException.h> | 25 #include <OrthancException.h> |
26 | 26 #include <Toolbox.h> |
27 #include <json/reader.h> | |
28 | 27 |
29 namespace OrthancStone | 28 namespace OrthancStone |
30 { | 29 { |
31 void IOrthancConnection::ParseJson(Json::Value& result, | 30 void IOrthancConnection::ParseJson(Json::Value& result, |
32 const std::string& content) | 31 const std::string& content) |
33 { | 32 { |
34 Json::Reader reader; | 33 if (!Orthanc::Toolbox::ReadJson(result, content)) |
35 | |
36 if (!reader.parse(content, result)) | |
37 { | 34 { |
38 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | 35 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); |
39 } | 36 } |
40 } | 37 } |
41 | 38 |
42 | 39 |
43 void IOrthancConnection::ParseJson(Json::Value& result, | 40 void IOrthancConnection::ParseJson(Json::Value& result, |
44 const void* content, | 41 const void* content, |
45 size_t size) | 42 size_t size) |
46 { | 43 { |
47 Json::Reader reader; | 44 if (!Orthanc::Toolbox::ReadJson(result, content, size)) |
48 | |
49 if (!reader.parse(reinterpret_cast<const char*>(content), | |
50 reinterpret_cast<const char*>(content) + size, result)) | |
51 { | 45 { |
52 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | 46 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); |
53 } | 47 } |
54 } | 48 } |
55 | 49 |