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

调整扫描仪属性名称及顺序，以name字段区分属性ID

This commit is contained in:
gb 2022-10-07 17:50:28 +08:00
parent 5eb5aa60e1
commit c4fbab77ca
11 changed files with 145 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hgdriver/hgdev/common_setting.cpp
View File

@ -23,13 +23,13 @@ g_multi_out[] =
},
g_rid_color[] =
{
{OPTION_VALUE_HDHHBTX_CS_BCS, RID_COLOR_NONE},
{OPTION_VALUE_HDHHBTX_CS_CHS, RID_COLOR_RID_RED},
{OPTION_VALUE_HDHHBTX_CS_CLS, RID_COLOR_RID_GREEN},
{OPTION_VALUE_HDHHBTX_CS_CHULANSE, RID_COLOR_RID_BLUE},
{OPTION_VALUE_HDHHBTX_CS_HSZQ, RID_COLOR_ENHANCE_RED},
{OPTION_VALUE_HDHHBTX_CS_LSZQ, RID_COLOR_ENHANCE_GREEN},
{OPTION_VALUE_HDHHBTX_CS_LANSEZENGQIANG, RID_COLOR_ENHANCE_BLUE}
{OPTION_VALUE_HDHHBTX_CSYZQ_BCS, RID_COLOR_NONE},
{OPTION_VALUE_HDHHBTX_CSYZQ_CHS, RID_COLOR_RID_RED},
{OPTION_VALUE_HDHHBTX_CSYZQ_CLS, RID_COLOR_RID_GREEN},
{OPTION_VALUE_HDHHBTX_CSYZQ_CHULANSE, RID_COLOR_RID_BLUE},
{OPTION_VALUE_HDHHBTX_CSYZQ_HSZQ, RID_COLOR_ENHANCE_RED},
{OPTION_VALUE_HDHHBTX_CSYZQ_LSZQ, RID_COLOR_ENHANCE_GREEN},
{OPTION_VALUE_HDHHBTX_CSYZQ_LANSEZENGQIANG, RID_COLOR_ENHANCE_BLUE}
},
g_paper[] =
@ -120,13 +120,13 @@ g_paper_strenght[]=
},
g_sleep_time[]=
{
{OPTION_VALUE_SLEEP_0,SLEEP_TIME_0MIN},
{OPTION_VALUE_SLEEP_5,SLEEP_TIME_5MIN},
{OPTION_VALUE_SLEEP_10,SLEEP_TIME_10MIN},
{OPTION_VALUE_SLEEP_30,SLEEP_TIME_30MIN},
{OPTION_VALUE_SLEEP_60,SLEEP_TIME_60MIN},
{OPTION_VALUE_SLEEP_120,SLEEP_TIME_120MIN},
{OPTION_VALUE_SLEEP_240,SLEEP_TIME_240MIN},
{OPTION_VALUE_XMSJ_BXM,SLEEP_TIME_0MIN},
{OPTION_VALUE_XMSJ_WFZ,SLEEP_TIME_5MIN},
{OPTION_VALUE_XMSJ_SFZ,SLEEP_TIME_10MIN},
{OPTION_VALUE_XMSJ_BXS,SLEEP_TIME_30MIN},
{OPTION_VALUE_XMSJ_YXS,SLEEP_TIME_60MIN},
{OPTION_VALUE_XMSJ_LXS,SLEEP_TIME_120MIN},
{OPTION_VALUE_XMSJ_SXS,SLEEP_TIME_240MIN},
};
static struct paper_size

185
hgdriver/hgdev/hg_scanner.cpp
View File

@ -225,166 +225,161 @@ int hg_scanner::save_2_tempory_file(std::shared_ptr<std::vector<char>> data, std
return ret;
}
void hg_scanner::set_setting_map(int sn, const char* title)
void hg_scanner::set_setting_map(int sn, const char* name)
{
std::string val(title);
int empty = 0;
while (empty < val.length() && val[empty] == ' ')
empty++;
val.erase(0, empty);
std::string val(name);
//VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO, "title: '%s', val: '%s'\n", title, val.c_str());
if (val == OPTION_TITLE_HFMRSZ)
if (val == SANE_STD_OPT_NAME_RESTORE)
setting_map_[sn] = &hg_scanner::setting_restore;
else if (val == OPTION_TITLE_BZ)
else if (val == SANE_STD_OPT_NAME_HELP)
setting_map_[sn] = &hg_scanner::setting_help;
else if (val == OPTION_TITLE_YSMS)
else if (val == SANE_STD_OPT_NAME_COLOR_MODE)
setting_map_[sn] = &hg_scanner::setting_color_mode;
else if (val == OPTION_TITLE_DLSC)
else if (val == SANE_STD_OPT_NAME_IS_MULTI_OUT)
setting_map_[sn] = &hg_scanner::setting_multi_out;
else if (val == OPTION_TITLE_DLSCLX)
else if (val == SANE_STD_OPT_NAME_MULTI_OUT_TYPE)
setting_map_[sn] = &hg_scanner::setting_multi_out_type;
else if (val == OPTION_TITLE_HDHHBTX_CS)
else if (val == SANE_STD_OPT_NAME_FILTER)
setting_map_[sn] = &hg_scanner::setting_rid_color;
else if (val == OPTION_TITLE_24WCSTX_DLSCCH)
else if (val == SANE_STD_OPT_NAME_RID_MULTIOUT_RED)
setting_map_[sn] = &hg_scanner::setting_rid_multi_red;
else if (val == OPTION_TITLE_24WCSTX_DTKCH)
else if (val == SANE_STD_OPT_NAME_RID_ANSWER_SHEET_RED)
setting_map_[sn] = &hg_scanner::setting_rid_answer_red;
else if (val == OPTION_TITLE_BJYC)
else if (val == SANE_STD_OPT_NAME_ERASE_BACKGROUND)
setting_map_[sn] = &hg_scanner::setting_erase_background;
else if (val == OPTION_TITLE_BJSCFDFW)
else if (val == SANE_STD_OPT_NAME_BKG_COLOR_RANGE)
setting_map_[sn] = &hg_scanner::setting_erase_background_range;
else if (val == OPTION_TITLE_HBTXZDYH)
else if (val == SANE_STD_OPT_NAME_NOISE_OPTIMIZE)
setting_map_[sn] = &hg_scanner::setting_noise_optimize;
else if (val == OPTION_TITLE_ZDYHCC)
else if (val == SANE_STD_OPT_NAME_NOISE_SIZE)
setting_map_[sn] = &hg_scanner::setting_noise_optimize_range;
else if (val == OPTION_TITLE_ZZCC)
else if (val == SANE_STD_OPT_NAME_PAPER)
setting_map_[sn] = &hg_scanner::setting_paper;
else if (val == OPTION_TITLE_CCJC)
else if (val == SANE_STD_OPT_NAME_SIZE_CHECK)
setting_map_[sn] = &hg_scanner::setting_paper_check;
else if (val == OPTION_TITLE_ZDYSMQY)
else if (val == SANE_STD_OPT_NAME_CUSTOM_AREA)
setting_map_[sn] = &hg_scanner::setting_is_custom_area;
else if (val == OPTION_TITLE_SMQYZCmm)
else if (val == SANE_STD_OPT_NAME_CUSTOM_AREA_LEFT)
setting_map_[sn] = &hg_scanner::setting_custom_area_left;
else if (val == OPTION_TITLE_SMQYYCmm)
else if (val == SANE_STD_OPT_NAME_CUSTOM_AREA_RIGHT)
setting_map_[sn] = &hg_scanner::setting_custom_area_right;
else if (val == OPTION_TITLE_SMQYSCmm)
else if (val == SANE_STD_OPT_NAME_CUSTOM_AREA_TOP)
setting_map_[sn] = &hg_scanner::setting_custom_area_top;
else if (val == OPTION_TITLE_SMQYXCmm)
else if (val == SANE_STD_OPT_NAME_CUSTOM_AREA_BOTTOM)
setting_map_[sn] = &hg_scanner::setting_custom_area_bottom;
else if (val == OPTION_TITLE_SMYM)
else if (val == SANE_STD_OPT_NAME_PAGE)
setting_map_[sn] = &hg_scanner::setting_page;
else if (val == OPTION_TITLE_TGKBYLMD)
else if (val == SANE_STD_OPT_NAME_DISCARD_BLANK_SENS)
setting_map_[sn] = &hg_scanner::setting_page_omit_empty;
else if (val == OPTION_TITLE_FBL)
else if (val == SANE_STD_OPT_NAME_RESOLUTION)
setting_map_[sn] = &hg_scanner::setting_resolution;
else if (val == OPTION_TITLE_HZ)
else if (val == SANE_STD_OPT_NAME_IMAGE_QUALITY)
setting_map_[sn] = &hg_scanner::setting_img_quality;
else if (val == OPTION_TITLE_JHZFM)
else if (val == SANE_STD_OPT_NAME_EXCHANGE)
setting_map_[sn] = &hg_scanner::setting_exchagnge;
else if (val == OPTION_TITLE_TXCF)
else if (val == SANE_STD_OPT_NAME_SPLIT)
setting_map_[sn] = &hg_scanner::setting_split_image;
else if (val == OPTION_TITLE_ZDJP)
else if (val == SANE_STD_OPT_NAME_ANTI_SKEW)
setting_map_[sn] = &hg_scanner::setting_automatic_skew;
else if (val == OPTION_TITLE_CKYC)
else if (val == SANE_STD_OPT_NAME_RID_HOLE)
setting_map_[sn] = &hg_scanner::setting_rid_hole;
else if (val == OPTION_TITLE_CKSSFWZFMBL)
else if (val == SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE)
setting_map_[sn] = &hg_scanner::setting_rid_hoe_range;
else if (val == OPTION_TITLE_QYSDQX)
else if (val == SANE_STD_OPT_NAME_IS_CUSTOM_GAMMA)
setting_map_[sn] = &hg_scanner::setting_is_custom_gamma;
else if (val == OPTION_TITLE_LDZ)
else if (val == SANE_STD_OPT_NAME_BRIGHTNESS)
setting_map_[sn] = &hg_scanner::setting_bright;
else if (val == OPTION_TITLE_DBD)
else if (val == SANE_STD_OPT_NAME_CONTRAST)
setting_map_[sn] = &hg_scanner::setting_contrast;
else if (val == OPTION_TITLE_GMZ)
else if (val == SANE_STD_OPT_NAME_GAMMA)
setting_map_[sn] = &hg_scanner::setting_gamma;
else if (val == OPTION_TITLE_RHYMH)
else if (val == SANE_STD_OPT_NAME_SHARPEN)
setting_map_[sn] = &hg_scanner::setting_sharpen;
else if (val == OPTION_TITLE_SSYZ)
else if (val == SANE_STD_OPT_NAME_DARK_SAMPLE)
setting_map_[sn] = &hg_scanner::setting_dark_sample;
else if (val == OPTION_TITLE_XCHK)
else if (val == SANE_STD_OPT_NAME_ERASE_BLACK_FRAME)
setting_map_[sn] = &hg_scanner::setting_erase_black_frame;
else if (val == OPTION_TITLE_YZ)
else if (val == SANE_STD_OPT_NAME_THRESHOLD)
setting_map_[sn] = &hg_scanner::setting_threshold;
else if (val == OPTION_TITLE_BJKZDJ)
else if (val == SANE_STD_OPT_NAME_ANTI_NOISE_LEVEL)
setting_map_[sn] = &hg_scanner::setting_anti_noise;
else if (val == OPTION_TITLE_BYSJ)
else if (val == SANE_STD_OPT_NAME_MARGIN)
setting_map_[sn] = &hg_scanner::setting_margin;
else if (val == OPTION_TITLE_BJTCFS)
else if (val == SANE_STD_OPT_NAME_FILL_BKG_MODE)
setting_map_[sn] = &hg_scanner::setting_filling_background;
else if (val == OPTION_TITLE_FZST)
else if (val == SANE_STD_OPT_NAME_IS_ANTI_PERMEATE)
setting_map_[sn] = &hg_scanner::setting_is_permeate;
else if (val == OPTION_TITLE_FZSTDJ)
else if (val == SANE_STD_OPT_NAME_ANTI_PERMEATE_LEVEL)
setting_map_[sn] = &hg_scanner::setting_is_permeate_lv;
else if (val == OPTION_TITLE_QCMW)
else if (val == SANE_STD_OPT_NAME_RID_MORR)
setting_map_[sn] = &hg_scanner::setting_remove_morr;
else if (val == OPTION_TITLE_CWKS)
else if (val == SANE_STD_OPT_NAME_ERROR_EXTENSION)
setting_map_[sn] = &hg_scanner::setting_error_extention;
else if (val == OPTION_TITLE_CWW)
else if (val == SANE_STD_OPT_NAME_RID_GRID)
setting_map_[sn] = &hg_scanner::setting_remove_texture;
else if (val == OPTION_TITLE_CSBJC)
else if (val == SANE_STD_OPT_NAME_IS_ULTROSONIC_CHECK)
setting_map_[sn] = &hg_scanner::setting_ultrasonic_check;
else if (val == OPTION_TITLE_SZTPCL)
else if (val == SANE_STD_OPT_NAME_DOUBLE_FEED_HANDLE)
setting_map_[sn] = &hg_scanner::setting_go_on_when_double_checked;
else if (val == OPTION_TITLE_ZDJC)
else if (val == SANE_STD_OPT_NAME_IS_CHECK_STAPLE)
setting_map_[sn] = &hg_scanner::setting_staple_check;
else if (val == OPTION_TITLE_SMZS)
else if (val == SANE_STD_OPT_NAME_SCAN_MODE)
{
setting_map_[sn] = &hg_scanner::setting_scan_mode;
id_scan_mode_ = sn;
}
else if (val == OPTION_TITLE_SMSL)
else if (val == SANE_STD_OPT_NAME_SCAN_COUNT)
{
setting_map_[sn] = &hg_scanner::setting_scan_count;
id_scan_count_ = sn;
}
else if (val == OPTION_TITLE_WGFX)
else if (val == SANE_STD_OPT_NAME_TEXT_DIRECTION)
setting_map_[sn] = &hg_scanner::setting_text_direction;
else if (val == OPTION_TITLE_BMXZ180)
else if (val == SANE_STD_OPT_NAME_IS_ROTATE_BKG_180)
setting_map_[sn] = &hg_scanner::setting_rotate_bkg_180;
else if (val == OPTION_TITLE_ZJJC)
else if (val == SANE_STD_OPT_NAME_IS_CHECK_DOG_EAR)
setting_map_[sn] = &hg_scanner::setting_fractate_check;
else if (val == OPTION_TITLE_ZJDX)
else if (val == SANE_STD_OPT_NAME_DOG_EAR_SIZE)
setting_map_[sn] = &hg_scanner::setting_fractate_check_level;
else if (val == OPTION_TITLE_WXJC)
else if (val == SANE_STD_OPT_NAME_IS_CHECK_ASKEW)
setting_map_[sn] = &hg_scanner::setting_skew_check;
else if (val == OPTION_TITLE_WXRRD)
else if (val == SANE_STD_OPT_NAME_ASKEW_RANGE)
setting_map_[sn] = &hg_scanner::setting_skew_check_level;
else if (val == OPTION_TITLE_SCTC)
else if (val == SANE_STD_OPT_NAME_IS_FILL_COLOR)
setting_map_[sn] = &hg_scanner::setting_color_fill;
else if(val == OPTION_TITLE_HBTXYZ)
else if(val == SANE_STD_OPT_NAME_BINARY_THRESHOLD)
setting_map_[sn] = &hg_scanner::setting_black_white_threshold;
else if(val == OPTION_TITLE_HBTXFSSC)
else if(val == SANE_STD_OPT_NAME_REVERSE_01)
setting_map_[sn] = &hg_scanner::setting_white_pixel_0;
else if(val == OPTION_TITLE_ZPMS)
else if(val == SANE_STD_OPT_NAME_IS_PHOTO_MODE)
setting_map_[sn] = &hg_scanner::setting_keep_watermark;
else if (val == OPTION_TITLE_XMSJ)
else if (val == SANE_STD_OPT_NAME_TIME_TO_SLEEP)
setting_map_[sn] = &hg_scanner::setting_setsleeptime;
else if (val == OPTION_TITLE_FZQD)
else if (val == SANE_STD_OPT_NAME_FEED_STRENGTH)
setting_map_[sn] = &hg_scanner::setting_setfeedmode;
else if (val == OPTION_TITLE_ZDCZQD)
else if (val == SANE_STD_OPT_NAME_IS_AUTO_FEED_STRENGTH)
setting_map_[sn] = &hg_scanner::setting_set_auto_pick_paper;
else if (val == OPTION_TITLE_CZYZ)
else if (val == SANE_STD_OPT_NAME_FEED_STRENGTH_VALUE)
setting_map_[sn] = &hg_scanner::setting_set_auto_pick_paper_threshold;
else if (val == OPTION_TITLE_DZSM)
else if (val == SANE_STD_OPT_NAME_WAIT_TO_SCAN)
setting_map_[sn] = &hg_scanner::setting_set_auto_paper_scan;
else if (val == OPTION_TITLE_CKYCZC)
else if (val == SANE_STD_OPT_NAME_RID_HOLE_L)
setting_map_[sn] = &hg_scanner::setting_set_isremove_left_hole;
else if (val == OPTION_TITLE_ZCCKSSFWZFMBL)
else if (val == SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_L)
setting_map_[sn] = &hg_scanner::setting_set_isremove_left_hole_threshold;
else if (val == OPTION_TITLE_CKYCYC)
else if (val == SANE_STD_OPT_NAME_RID_HOLE_R)
setting_map_[sn] = &hg_scanner::setting_set_isremove_right_hole;
else if (val == OPTION_TITLE_YCCKSSFWZFMBL)
else if (val == SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_R)
setting_map_[sn] = &hg_scanner::setting_set_isremove_right_hole_threshold;
else if (val == OPTION_TITLE_CKYCSC)
else if (val == SANE_STD_OPT_NAME_RID_HOLE_T)
setting_map_[sn] = &hg_scanner::setting_set_isremove_top_hole;
else if (val == OPTION_TITLE_SCCKSSFWZFMBL)
else if (val == SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_T)
setting_map_[sn] = &hg_scanner::setting_set_isremove_top_hole_threshold;
else if (val == OPTION_TITLE_CKYCXC)
else if (val == SANE_STD_OPT_NAME_RID_HOLE_B)
setting_map_[sn] = &hg_scanner::setting_set_isremove_low_hole;
else if (val == OPTION_TITLE_XCCKSSFWZFMBL)
else if (val == SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_B)
setting_map_[sn] = &hg_scanner::setting_set_isremove_low_hole_threshold;
}
void hg_scanner::thread_handle_usb(void)
@ -2058,7 +2053,7 @@ void hg_scanner::init_settings(const char* json_setting_text)
sprintf(key, "%d", sn);
#ifdef MAPPING_FUNCTION_IN_BASE
setting_jsn_.at(key).at("title").get_to(val);
setting_jsn_.at(key).at("name").get_to(val);
set_setting_map(sn, val.c_str());
#endif
@ -2571,20 +2566,18 @@ int hg_scanner::get_setting(int setting_no, char* json_txt_buf, int* len)
if (!setting_jsn_.contains(sn))
VLOG_MINI_2(LOG_LEVEL_FATAL, "!!!option(%d - %s) is not found.\n", setting_no, sn);
text = setting_jsn_.at(sn).dump();
setting_jsn_.at(sn).at("title").get_to(name);
while (name.length() && name[0] == ' ')
name.erase(0, 1);
if (name == OPTION_TITLE_SMQYZCmm || name == OPTION_TITLE_SMQYYCmm)
setting_jsn_.at(sn).at("name").get_to(name);
if (name == SANE_STD_OPT_NAME_CUSTOM_AREA_LEFT || name == SANE_STD_OPT_NAME_CUSTOM_AREA_RIGHT)
{
is_area_x = true;
add = 20;
}
else if (name == OPTION_TITLE_SMQYSCmm || name == OPTION_TITLE_SMQYXCmm)
else if (name == SANE_STD_OPT_NAME_CUSTOM_AREA_TOP || name == SANE_STD_OPT_NAME_CUSTOM_AREA_BOTTOM)
{
is_area_y = true;
add = 20;
}
else if (name == OPTION_TITLE_FZQD)
else if (name == SANE_STD_OPT_NAME_FEED_STRENGTH)
{
std::string strfeed("");
if (!save_feedmode_type_)
@ -2606,7 +2599,7 @@ int hg_scanner::get_setting(int setting_no, char* json_txt_buf, int* len)
setting_jsn_.at(sn).at("cur")= strfeed;
text = setting_jsn_.at(sn).dump();
}
else if (name == OPTION_TITLE_XMSJ)
else if (name == SANE_STD_OPT_NAME_TIME_TO_SLEEP)
{
std::string strtime("");
if (!save_sleeptime_type_)
@ -2616,31 +2609,31 @@ int hg_scanner::get_setting(int setting_no, char* json_txt_buf, int* len)
switch (sleeptime_)
{
case -1:
strtime = OPTION_VALUE_SLEEP_0;;
strtime = OPTION_VALUE_XMSJ_BXM;;
break;
case 5:
strtime = OPTION_VALUE_SLEEP_5;
strtime = OPTION_VALUE_XMSJ_WFZ;
break;
case 10:
strtime = OPTION_VALUE_SLEEP_10;
strtime = OPTION_VALUE_XMSJ_SFZ;
break;
case 30:
strtime = OPTION_VALUE_SLEEP_30;
strtime = OPTION_VALUE_XMSJ_BXS;
break;
case 60:
strtime = OPTION_VALUE_SLEEP_60;
strtime = OPTION_VALUE_XMSJ_YXS;
break;
case 120:
strtime = OPTION_VALUE_SLEEP_120;
strtime = OPTION_VALUE_XMSJ_LXS;
break;
case 240:
strtime = OPTION_VALUE_SLEEP_240;
strtime = OPTION_VALUE_XMSJ_SXS;
break;
}
setting_jsn_.at(sn).at("cur") = strtime;
text = setting_jsn_.at(sn).dump();
}
else if (name == OPTION_TITLE_DZSM)
else if (name == SANE_STD_OPT_NAME_WAIT_TO_SCAN)
{
if(user_cancel_ && is_auto_paper_scan)
{
@ -2648,7 +2641,7 @@ int hg_scanner::get_setting(int setting_no, char* json_txt_buf, int* len)
//text = setting_jsn_.at(sn).dump();
}
}
else if (name == OPTION_TITLE_HBTXFSSC)
else if (name == SANE_STD_OPT_NAME_REVERSE_01)
{
setting_jsn_.at(sn).at("cur") = is_white_0_;
text = setting_jsn_.at(sn).dump();

2
hgdriver/hgdev/hg_scanner.h
View File

@ -90,7 +90,7 @@ protected:
//virtual void init_setting_map(int* setting_map, int count);
map<int, int (hg_scanner::*)(int, void*)> setting_map_;
int invoke_setting_xxx(int(hg_scanner::* func)(int, void*), void* data);
void set_setting_map(int sn, const char* title);
void set_setting_map(int sn, const char* name);
int setting_restore(int sn, void* data);
int setting_help(int sn, void* data);

8
hgdriver/hgdev/hg_scanner_200.cpp
View File

File diff suppressed because one or more lines are too long

14
hgdriver/hgdev/hg_scanner_239.cpp
View File

File diff suppressed because one or more lines are too long

8
hgdriver/hgdev/hg_scanner_300.cpp
View File

File diff suppressed because one or more lines are too long

9
hgdriver/hgdev/hg_scanner_302.cpp
View File

File diff suppressed because one or more lines are too long

8
hgdriver/hgdev/hg_scanner_400.cpp
View File

File diff suppressed because one or more lines are too long

14
hgdriver/hgdev/hg_scanner_402.cpp
View File

File diff suppressed because one or more lines are too long

10
hgdriver/hgdev/hg_scanner_439.cpp
View File

File diff suppressed because one or more lines are too long

8
hgsane/sane_option.cpp
View File

@ -110,7 +110,7 @@ void sane_std_opts::to_known_opt_value(OPTMAP* opmap, const void* data, void* kn
{
*((SANE_Bool*)known_data) = strcmp((char*)data, OPTION_VALUE_SMYM_DM) == 0 ? SANE_FALSE : SANE_TRUE;
}
else if (strcmp(opmap->user.desc->name, OPTION_TITLE_SMYM) == 0)
else if (strcmp(opmap->user.desc->name, SANE_STD_OPT_NAME_PAGE) == 0)
{
bool ok = false;
for (size_t i = 0; i < ARRAY_SIZE(g_paper); ++i)
@ -150,7 +150,7 @@ void* sane_std_opts::from_known_opt_value(OPTMAP* opmap, const void* known_data,
else
strcpy((char*)buf, OPTION_VALUE_SMYM_DM);
}
else if (strcmp(opmap->user.desc->title, OPTION_TITLE_ZZCC) == 0)
else if (strcmp(opmap->user.desc->name, SANE_STD_OPT_NAME_PAPER) == 0)
{
int cx = page_width_,
cy = page_height_;
@ -242,7 +242,7 @@ void* sane_std_opts::get_current_value(scanner_handle h, int opt)
void sane_std_opts::init_known_opt(int option, SANE_Option_Descriptor* desc)
{
if (strcmp(desc->title, OPTION_TITLE_SMYM) == 0)
if (strcmp(desc->name, SANE_STD_OPT_NAME_PAGE) == 0)
{
// duplex
if (!get_known_option(SANE_STD_OPT_NAME_DUPLEX))
@ -267,7 +267,7 @@ void sane_std_opts::init_known_opt(int option, SANE_Option_Descriptor* desc)
known_opts_.push_back(om);
}
}
else if (strcmp(desc->title, OPTION_TITLE_ZZCC) == 0)
else if (strcmp(desc->name, SANE_STD_OPT_NAME_PAPER) == 0)
{
// page-width && page-height
if (!get_known_option(SANE_STD_OPT_NAME_PAPER_W))