From 788f1c5cf9216bfbfe8bd2cbeb2b0363fb7b8116 Mon Sep 17 00:00:00 2001 From: lovelyyoung <1002639516@qq.com> Date: Tue, 7 Jul 2020 09:53:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AA=E5=88=AB=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BF=9D=E5=AD=98=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- huagao/GscanJsonConfig.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/huagao/GscanJsonConfig.cpp b/huagao/GscanJsonConfig.cpp index 669b6be6..8841d2cb 100644 --- a/huagao/GscanJsonConfig.cpp +++ b/huagao/GscanJsonConfig.cpp @@ -396,8 +396,8 @@ std::vector GscanJsonConfig::parseJsonFromString(const std::string str itmEnSwitchFrontBack.Get(i, b_value); cfp.is_switchfrontback = b_value ? 1 : 0; - itmBrtnes.Get(i, i_value); - cfp.brightness = i_value; + itmBrtnes.Get(i, f_value); + cfp.brightness = f_value; itmAutoCrnt.Get(i, b_value); cfp.is_autocontrast = b_value ? 1 : 0; itmContrast.Get(i, i_value); @@ -439,7 +439,7 @@ std::vector GscanJsonConfig::parseJsonFromString(const std::string str itmScrewDetct.Get(i, b_value); cfp.hardwarecaps.en_skrewdetect = b_value ? 1 : 0; itmScrewLevel.Get(i, i_value); - cfp.hardwarecaps.skrewdetectlevel = i_value ? 1 : 0; + cfp.hardwarecaps.skrewdetectlevel = i_value; if (!root["Config"][ITEMCAPTION].IsEmpty()) {