From 5099ccbcd10225b61f2e4c17b3b43ef10c68ebb7 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Mon, 30 May 2022 11:34:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E5=A4=B4=E6=96=87=E4=BB=B6=E5=8C=85=E5=90=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgsane/sane_hg_mdw.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/hgsane/sane_hg_mdw.cpp b/hgsane/sane_hg_mdw.cpp index ee05708..c143b61 100644 --- a/hgsane/sane_hg_mdw.cpp +++ b/hgsane/sane_hg_mdw.cpp @@ -16,8 +16,6 @@ #include #endif -#include "ini_file.h" - #include "../../sdk/include/sane/sane_option_definitions.h" #include "sane_option.h" @@ -140,7 +138,7 @@ namespace local_utility return str > bgn; } - // 暂不支持科学计数法 1.2e+10 + // 暂不支持科学计数?1.2e+10 bool get_number(const char*& str, double& val) { const char* bgn = str; @@ -492,7 +490,7 @@ SANE_Option_Descriptor* hg_sane_middleware::string_option_to_SANE_descriptor(con sod->unit = SANE_UNIT_NONE; sod->size = values.size(); sod->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT // 软件可设置选项 - | SANE_CAP_AUTOMATIC; // 硬件可设置默认值 + | SANE_CAP_AUTOMATIC; // 硬件可设置默认? if (values.size()) { sod->constraint_type = SANE_CONSTRAINT_STRING_LIST; @@ -545,7 +543,7 @@ SANE_Option_Descriptor* hg_sane_middleware::number_option_to_SANE_descriptor(con sod->unit = SANE_UNIT_NONE; sod->size = sizeof(SANE_Word); sod->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT // 软件可设置选项 - /*| SANE_CAP_AUTOMATIC*/; // 硬件可设置默认值 + /*| SANE_CAP_AUTOMATIC*/; // 硬件可设置默认? if (lower || upper) { sod->size = sizeof(SANE_Range); @@ -606,7 +604,7 @@ SANE_Option_Descriptor* hg_sane_middleware::number_option_to_SANE_descriptor(con sod->unit = SANE_UNIT_NONE; sod->size = sizeof(SANE_Word); sod->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT // 软件可设置选项 - /*| SANE_CAP_AUTOMATIC*/; // 硬件可设置默认值 + /*| SANE_CAP_AUTOMATIC*/; // 硬件可设置默认? if (values.size()) { @@ -656,7 +654,7 @@ SANE_Option_Descriptor* hg_sane_middleware::number_option_to_SANE_descriptor(con sod->unit = SANE_UNIT_NONE; sod->size = sizeof(SANE_Word); sod->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT // 软件可设置选项 - /*| SANE_CAP_AUTOMATIC*/; // 硬件可设置默认值 + /*| SANE_CAP_AUTOMATIC*/; // 硬件可设置默认? if (values.size()) { @@ -676,7 +674,7 @@ SANE_Option_Descriptor* hg_sane_middleware::number_option_to_SANE_descriptor(con void hg_sane_middleware::on_device_closed(scanner_handle h) { - // 由于目前对多设备的支持还不是刚需，故代码只考虑单设备情况，设备关闭后，清除所有变量 + // 由于目前对多设备的支持还不是刚需，故代码只考虑单设备情况，设备关闭后，清除所有变? for (size_t i = 0; i < opts_.size(); ++i) { local_utility::free_memory(opts_[i].desc); @@ -882,7 +880,7 @@ SANE_Option_Descriptor* hg_sane_middleware::from_json(scanner_handle h, json* js //if (jsn->get_value("enable", enabled) && !enabled) // ret->cap |= SANE_CAP_INACTIVE; - // 关联项 + // 关联? json* depend = NULL; SLAVEOP so; if (jsn->get_value("depend_or", depend)) @@ -1135,7 +1133,7 @@ SANE_Status hg_sane_middleware::get_devices(const SANE_Device*** device_list, SA if (hgerr == SCANNER_ERR_INSUFFICIENT_MEMORY) { - count += 4; // 为两次hg_scanner_enum间隙可能新增的设备预留空间 + count += 4; // 为两次hg_scanner_enum间隙可能新增的设备预留空? dev = (ScannerInfo*)local_utility::acquire_memory(sizeof(ScannerInfo) * count, "hg_sane_middleware::get_devices"); hgerr = hg_scanner_enum(dev, &count, local_only); if (hgerr != SCANNER_ERR_OK) @@ -1469,7 +1467,7 @@ SANE_Status hg_sane_middleware::io_control(SANE_Handle h, unsigned long code, vo } /// -/// 关联项处理 +/// 关联项处? bool hg_sane_middleware::compare_val_equal(const char* cur_val, const char* limit_l, const char* limit_r) { return strcmp(cur_val, limit_l) == 0;