From d98f5039a5fe04e41ddc01dd5c3843b64d35927e Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Fri, 19 Jan 2024 17:28:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=97=E6=B3=95=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E4=BF=A1=E6=81=AFBUG=E3=80=82cv::Mat=E5=86=85?= =?UTF-8?q?=E5=AD=98=E9=97=AE=E9=A2=98=E5=BE=85=E8=A7=A3=E5=86=B3~~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/sane-opts/rebuild.txt | 3 ++- imgproc/algs/rebuild.cpp | 2 +- sdk/imgprc/img_processor.cpp | 2 +- xmake.lua | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/sane-opts/rebuild.txt b/docs/sane-opts/rebuild.txt index 55b6a3a..16803ad 100644 --- a/docs/sane-opts/rebuild.txt +++ b/docs/sane-opts/rebuild.txt @@ -5,6 +5,7 @@ "title": "CIS图像还原", "desc": "将从CIS输出的原始数据流,还原为BMP图片,并拆分正反面", "type": "bool", + "pos": 10, "ui-pos": 1, "auth": 0, "visible": 0, @@ -13,4 +14,4 @@ "cur": true, "default": true } -} +} \ No newline at end of file diff --git a/imgproc/algs/rebuild.cpp b/imgproc/algs/rebuild.cpp index 22ea354..052cbfb 100644 --- a/imgproc/algs/rebuild.cpp +++ b/imgproc/algs/rebuild.cpp @@ -8,7 +8,7 @@ static std::string device_opt_json[] = { - "{\"rebuild\":{\"cat\":\"imgp\",\"group\":\"imgp\",\"title\":\"CIS\\u56fe\\u50cf\\u8fd8\\u539f\",\"desc\":\"\\u5c06\\u4eceCIS\\u8f93\\u51fa\\u7684\\u539f\\u59cb\\u6570\\u636e\\u6d41\\uff0c\\u8fd8\\u539f\\u4e3aBMP\\u56fe\\u7247\\uff0c\\u5e76\\u62c6\\u5206\\u6b63\\u53cd\\u9762\",\"type\":\"bool\",\"ui-pos\":1,\"auth\":0,\"visible\":0,\"size\":4,\"auto\":false,\"cur\":true,\"default\":true}}" + "{\"rebuild\":{\"cat\":\"imgp\",\"group\":\"imgp\",\"title\":\"CIS\\u56fe\\u50cf\\u8fd8\\u539f\",\"desc\":\"\\u5c06\\u4eceCIS\\u8f93\\u51fa\\u7684\\u539f\\u59cb\\u6570\\u636e\\u6d41\\uff0c\\u8fd8\\u539f\\u4e3aBMP\\u56fe\\u7247\\uff0c\\u5e76\\u62c6\\u5206\\u6b63\\u53cd\\u9762\",\"type\":\"bool\",\"pos\":10,\"ui-pos\":1,\"auth\":0,\"visible\":0,\"size\":4,\"auto\":false,\"cur\":true,\"default\":true}}" }; rebuild::rebuild() : image_processor("rebuild") diff --git a/sdk/imgprc/img_processor.cpp b/sdk/imgprc/img_processor.cpp index 6c26902..89c114a 100644 --- a/sdk/imgprc/img_processor.cpp +++ b/sdk/imgprc/img_processor.cpp @@ -25,7 +25,7 @@ bool image_processor::set_opt_json_text(char* txt) if (first) { first->get_value("ver", ver_); - first->get_value("position", pos_); + first->get_value("pos", pos_); if (!first->get_value("enabled", enabled_)) enabled_ = true; first->release(); diff --git a/xmake.lua b/xmake.lua index 81a61e5..dafa75f 100644 --- a/xmake.lua +++ b/xmake.lua @@ -61,7 +61,7 @@ add_defines("BUILD_AS_DEVICE") add_defines("VER_MAIN=2") add_defines("VER_FAMILY=200") add_defines("VER_DATE=20240119") -add_defines("VER_BUILD=40") +add_defines("VER_BUILD=41") target("conf") set_kind("phony")