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

添加属性：对折模式

This commit is contained in:
gb 2022-10-24 16:58:09 +08:00
parent aa5c9ad904
commit 369e88e0ed
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sane/s2t_api.h
View File

@ -245,6 +245,7 @@ struct __declspec(novtable) ISaneInvoker : public IRef
SANE_OPTION_ID_API(search_hole_range_t); // 穿孔搜索范围 - 上
SANE_OPTION_ID_API(is_erase_hole_b); // 穿孔移除 - 下
SANE_OPTION_ID_API(search_hole_range_b); // 穿孔搜索范围 - 下
SANE_OPTION_ID_API(fold_direction); // 对折模式
// SANE-ex option ID:
SANE_OPTION_ID_API_EX(multiout_type); // int

2
sane/scanner.cpp
View File

@ -877,6 +877,7 @@ int scanner::init_options_id(void)
else SET_OPT_ID(search_hole_range_t, SEARCH_HOLE_RANGE_T, extension_none)
else SET_OPT_ID(is_erase_hole_b, RID_HOLE_B, extension_none)
else SET_OPT_ID(search_hole_range_b, SEARCH_HOLE_RANGE_B, extension_none)
else SET_OPT_ID(fold_direction, FOLD_TYPE, extension_none)
op_id++;
}
@ -2560,6 +2561,7 @@ SANE_OPTION_ID_IMPLEMENT(is_erase_hole_t)
SANE_OPTION_ID_IMPLEMENT(search_hole_range_t)
SANE_OPTION_ID_IMPLEMENT(is_erase_hole_b)
SANE_OPTION_ID_IMPLEMENT(search_hole_range_b)
SANE_OPTION_ID_IMPLEMENT(fold_direction)
// SANE-ex option ID:
SANE_OPTION_ID_IMPLEMENT(ex_multiout_type)

1
sane/scanner.h
View File

@ -292,6 +292,7 @@ public:
SANE_OPTION_ID(search_hole_range_t); // 穿孔搜索范围 - 上
SANE_OPTION_ID(is_erase_hole_b); // 穿孔移除 - 下
SANE_OPTION_ID(search_hole_range_b); // 穿孔搜索范围 - 下
SANE_OPTION_ID(fold_direction); // 对折模式
// SANE-ex option ID:
SANE_OPTION_ID(ex_multiout_type); // int

5
twain/twain/huagaods.cpp
View File

@ -138,7 +138,9 @@ enum CapTypeEx : unsigned short {
CAP_EX_SANE_is_erase_hole_t,
CAP_EX_SANE_search_hole_range_t,
CAP_EX_SANE_is_erase_hole_b,
CAP_EX_SANE_search_hole_range_b, // END for SANE设备层原始设置项透传属性
CAP_EX_SANE_search_hole_range_b,
CAP_EX_SANE_fold_direction,
// END for SANE设备层原始设置项透传属性
/////////////////////////////////////////////////////////////////////////
};
enum // .twain/first.cfg: [twain-app] flow=0
@ -2842,6 +2844,7 @@ void huagao_ds::init_support_caps_ex(void)
ADD_SANE_CAP(search_hole_range_t); // 穿孔搜索范围 - 上
ADD_SANE_CAP(is_erase_hole_b); // 穿孔移除 - 下
ADD_SANE_CAP(search_hole_range_b); // 穿孔搜索范围 - 下
ADD_SANE_CAP(fold_direction); // 对折方向
}
std::wstring huagao_ds::get_config_file(void)
{