Mercurial > hg > orthanc

comparison OrthancFramework/Sources/Images/Font.cpp @ 4392:3af1d763763a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
confining Json::Reader and Json::*Writer into Toolbox
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 21 Dec 2020 18:09:47 +0100
parents 785a2713323e
children d9473bd5ed43
comparison
equal deleted inserted replaced
4391:0c4ff5609548 4392:3af1d763763a
60 60
61 61
62 void Font::LoadFromMemory(const std::string& font) 62 void Font::LoadFromMemory(const std::string& font)
63 { 63 {
64 Json::Value v; 64 Json::Value v;
65 Json::Reader reader; 65 if (!Toolbox::ReadJson(v, font) ||
66 if (!reader.parse(font, v) ||
67 v.type() != Json::objectValue || 66 v.type() != Json::objectValue ||
68 !v.isMember("Name") || 67 !v.isMember("Name") ||
69 !v.isMember("Size") || 68 !v.isMember("Size") ||
70 !v.isMember("Characters") || 69 !v.isMember("Characters") ||
71 v["Name"].type() != Json::stringValue || 70 v["Name"].type() != Json::stringValue ||