summaryrefslogtreecommitdiff
path: root/libhwc2.1/libmaindisplay
diff options
context:
space:
mode:
authorlinpeter <linpeter@google.com>2021-03-17 12:36:43 +0800
committerlinpeter <linpeter@google.com>2021-03-17 20:08:56 +0800
commit54a8d971fd4b2bb21708a5a780d1608296520b12 (patch)
treefc961a6aafded14cfa4a2aa68f9aa31ec675c3f4 /libhwc2.1/libmaindisplay
parent3c2b8e85264416cda9f28158e3f300c58aaeb417 (diff)
downloadgs101-54a8d971fd4b2bb21708a5a780d1608296520b12.tar.gz
hwc/gs101: use new jsoncpp parse API
Json Reader is deprecated upstream Bug: 182959727 test: check read data Change-Id: Ife0163ac63bb7f796a3c51f68e868f404e4033f2
Diffstat (limited to 'libhwc2.1/libmaindisplay')
-rw-r--r--libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
index 5a1eda9..b92fffb 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
@@ -697,7 +697,8 @@ void ExynosPrimaryDisplayModule::DisplaySceneInfo::printLayerColorData(
bool ExynosPrimaryDisplayModule::parseAtcProfile() {
Json::Value root;
- Json::Reader reader;
+ Json::CharReaderBuilder reader_builder;
+ std::unique_ptr<Json::CharReader> reader(reader_builder.newCharReader());
std::string atc_profile;
if (!android::base::ReadFileToString(kAtcProfilePath, &atc_profile)) {
@@ -705,7 +706,8 @@ bool ExynosPrimaryDisplayModule::parseAtcProfile() {
ALOGI("Use default atc profile file");
}
- if (!reader.parse(atc_profile, root)) {
+ if (!reader->parse(atc_profile.c_str(), atc_profile.c_str() + atc_profile.size(), &root,
+ nullptr)) {
ALOGE("Failed to parse atc profile file");
return false;
}