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

解决twain-mfc标准协议的镜头脏污检测功能不生效的问题；

This commit is contained in:
yangjiaxuan 2024-01-09 15:27:53 +08:00
parent bf80eb1cbd
commit 481043bfab
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sane/s2t_api.h
View File

@ -260,6 +260,7 @@ struct __declspec(novtable) ISaneInvoker : public IRef
SANE_OPTION_ID_API(search_hole_range_b); // 穿孔搜索范围 - 下
SANE_OPTION_ID_API(fold_direction); // 对折模式
SANE_OPTION_ID_API(discardblank); // 跳过空白页
SANE_OPTION_ID_API(lens_dirty); // 镜头脏污检测
// SANE-ex option ID:
SANE_OPTION_ID_API_EX(multiout_type); // int

4
sane/scanner.cpp
View File

@ -206,6 +206,7 @@ namespace callback
, {SANE_STD_OPT_NAME_FOLD_TYPE , OPTION_TITLE_DZMS}
, {SANE_STD_OPT_NAME_COLOR_CORRECTION , OPTION_TITLE_SPJZ}
, {SANE_STD_OPT_NAME_DISCARDBLANK , OPTION_TITLE_TGKBY}
, {SANE_STD_OPT_NAME_LENS_DIRTY , OPTION_TITLE_JTZWJC}
},
g_discard[] = { {SANE_STD_OPT_NAME_REVERSE_01 , "\351\273\221\347\231\275\345\233\276\345\203\217\345\217\215\350\211\262\350\276\223\345\207\272\357\274\210\346\255\243\345\270\270\351\242\234\350\211\262\344\270\272\357\274\2320-\351\273\221\350\211\262\357\274\2331-\347\231\275\350\211\262\357\274\211"} // 濮掓稒é<E28099>¨ç‘°â–<C3A2>褔宕堕幆è¤<C3A8>é<EFBFBD>“奸柛娆忕Х婢瑰﹥娼忛幘é<CB9C><C3A9>å<EFBFBD>‰ç˜”é—<C3A9>挎稑é<E28098>—婇婊呮暜閹间緡é<C2A1>‰å½’柤纭呭紦é<C2A6> æ„®å––é<E28093>?-濮掓稒é<E28099>¨å…¼ç«Ÿæ¿ å›¨æ™?-é—<C3A9>谎冣å<C2A3>“é<E2809C>”奉棌é—<C3A9>?
, {SANE_STD_OPT_NAME_FILTER , "\347\201\260\345\272\246\346\210\226\351\273\221\347\231\275\345\233\276\345\203\217 - \351\231\244\350\211\262"} // é—<C3A9>诲繑婢樼€规娊骞嬮弽顓犳嫧é—<C3A9>谎嗘濞存﹢宕?- 闂傚嫨é<C2A8>Šæ¶™ç«Ÿ?
@ -1223,6 +1224,7 @@ int scanner::init_options_id(void)
INIT_FIXED_IDS(CUSTOM_GAMMA);
INIT_FIXED_IDS(MOTOR_VER);
INIT_FIXED_IDS(INITIAL_BOOT_TIME);
INIT_FIXED_IDS(LENS_DIRTY);
while ((desc = hg_sane_middleware::instance()->get_option_descriptor(handle_, (const void*)op_id)))
@ -1335,6 +1337,7 @@ int scanner::init_options_id(void)
else SET_OPT_ID(color_correction, COLOR_CORRECTION, extension_none)
else SET_OPT_ID(language, LANGUAGE, extension_none)
else SET_OPT_ID(discardblank, DISCARDBLANK, extension_none)
else SET_OPT_ID(lens_dirty, LENS_DIRTY, extension_none)
op_id++;
}
@ -3450,6 +3453,7 @@ SANE_OPTION_ID_IMPLEMENT(is_erase_hole_b)
SANE_OPTION_ID_IMPLEMENT(search_hole_range_b)
SANE_OPTION_ID_IMPLEMENT(fold_direction)
SANE_OPTION_ID_IMPLEMENT(discardblank)
SANE_OPTION_ID_IMPLEMENT(lens_dirty)
// SANE-ex option ID:
SANE_OPTION_ID_IMPLEMENT(ex_multiout_type)

1
sane/scanner.h
View File

@ -326,6 +326,7 @@ public:
SANE_OPTION_ID(search_hole_range_b); // 穿孔搜索范围 - 下
SANE_OPTION_ID(fold_direction); // 对折模式
SANE_OPTION_ID(discardblank); // 跳过空白页
SANE_OPTION_ID(lens_dirty); // 镜头脏污检测
// SANE-ex option ID:
SANE_OPTION_ID(ex_multiout_type); // int