Mercurial > hg > orthanc-stone
diff OrthancStone/Sources/Oracle/GetOrthancWebViewerJpegCommand.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 |
line wrap: on
line diff
--- a/OrthancStone/Sources/Oracle/GetOrthancWebViewerJpegCommand.cpp Tue Dec 22 09:06:33 2020 +0100 +++ b/OrthancStone/Sources/Oracle/GetOrthancWebViewerJpegCommand.cpp Tue Dec 22 09:16:42 2020 +0100 @@ -30,12 +30,6 @@ #include <OrthancException.h> #include <Toolbox.h> -#ifdef _MSC_VER -// 'Json::Reader': Use CharReader and CharReaderBuilder instead -#pragma warning(disable:4996) -#endif - -#include <json/reader.h> #include <json/value.h> namespace OrthancStone @@ -77,13 +71,9 @@ // This code comes from older "OrthancSlicesLoader::ParseSliceImageJpeg()" Json::Value encoded; - + if (!Orthanc::Toolbox::ReadJson(encoded, answer)) { - Json::Reader reader; - if (!reader.parse(answer, encoded)) - { - throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); - } + throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); } if (encoded.type() != Json::objectValue ||