lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

删除不用的头文件包含

This commit is contained in:
gb 2022-05-30 11:34:47 +08:00
parent fcf3a6bcff
commit 5099ccbcd1
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hgsane/sane_hg_mdw.cpp
View File

@ -16,8 +16,6 @@
#include <pthread.h>
#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
// æš‚ä¸<EFBFBD>支æŒ<EFBFBD>科学计数æ³?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; // 硬件å<EFBFBD>¯è®¾ç½®é»˜è®¤å€?
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*/; // 硬件å<EFBFBD>¯è®¾ç½®é»˜è®¤å€?
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*/; // 硬件å<EFBFBD>¯è®¾ç½®é»˜è®¤å€?
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*/; // 硬件å<EFBFBD>¯è®¾ç½®é»˜è®¤å€?
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)
{
// 由于目前对多设备的支持还不是刚需，故代码只考虑单设备情况，设备关闭后，清除所有变量
// 由于目å‰<EFBFBD>对多设备的支æŒ<EFBFBD>还ä¸<EFBFBD>是刚需，故代ç <EFBFBD>å<EFBFBD>ªè€ƒè™‘å<EFBFBD>•è®¾å¤‡æƒ…况，设备关闭å<EFBFBD>Žï¼Œæ¸…除所有å<EFBFBD>˜é‡?
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;
// 关联项
// å…³è<EFBFBD>”é¡?
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é—´éš™å<EFBFBD>¯èƒ½æ–°å¢žçš„设备预留空é—?
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
}
/// <summary>
/// 关联项处理
/// å…³è<EFBFBD>”项处ç<EFBFBD>?
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;