diff --git a/sane/s2t_api.h b/sane/s2t_api.h index c304b07..9aae19d 100644 --- a/sane/s2t_api.h +++ b/sane/s2t_api.h @@ -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 diff --git a/sane/scanner.cpp b/sane/scanner.cpp index 8479e52..d3c4534 100644 --- a/sane/scanner.cpp +++ b/sane/scanner.cpp @@ -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) diff --git a/sane/scanner.h b/sane/scanner.h index 092bc57..4262370 100644 --- a/sane/scanner.h +++ b/sane/scanner.h @@ -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 diff --git a/twain/twain/huagaods.cpp b/twain/twain/huagaods.cpp index 022ac2e..7f7962c 100644 --- a/twain/twain/huagaods.cpp +++ b/twain/twain/huagaods.cpp @@ -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) {