Mercurial > hg > orthanc-stone

comparison OrthancStone/Sources/Oracle/GetOrthancWebViewerJpegCommand.cpp @ 1737:ef2f56c0311c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
28 #include <Images/ImageProcessing.h> 28 #include <Images/ImageProcessing.h>
29 #include <Images/JpegReader.h> 29 #include <Images/JpegReader.h>
30 #include <OrthancException.h> 30 #include <OrthancException.h>
31 #include <Toolbox.h> 31 #include <Toolbox.h>
32 32
33 #ifdef _MSC_VER
34 // 'Json::Reader': Use CharReader and CharReaderBuilder instead
35 #pragma warning(disable:4996)
36 #endif
37
38 #include <json/reader.h>
39 #include <json/value.h> 33 #include <json/value.h>
40 34
41 namespace OrthancStone 35 namespace OrthancStone
42 { 36 {
43 GetOrthancWebViewerJpegCommand::GetOrthancWebViewerJpegCommand() : 37 GetOrthancWebViewerJpegCommand::GetOrthancWebViewerJpegCommand() :
75 const std::string& answer) const 69 const std::string& answer) const
76 { 70 {
77 // This code comes from older "OrthancSlicesLoader::ParseSliceImageJpeg()" 71 // This code comes from older "OrthancSlicesLoader::ParseSliceImageJpeg()"
78 72
79 Json::Value encoded; 73 Json::Value encoded;
80 74 if (!Orthanc::Toolbox::ReadJson(encoded, answer))
81 { 75 {
82 Json::Reader reader; 76 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
83 if (!reader.parse(answer, encoded))
84 {
85 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
86 }
87 } 77 }
88 78
89 if (encoded.type() != Json::objectValue || 79 if (encoded.type() != Json::objectValue ||
90 !encoded.isMember("Orthanc") || 80 !encoded.isMember("Orthanc") ||
91 encoded["Orthanc"].type() != Json::objectValue) 81 encoded["Orthanc"].type() != Json::objectValue)