Merge branch 'master' of http://192.168.100.140:8099/sane/code_app
This commit is contained in:
commit
ec0dd51d03
|
@ -656,26 +656,26 @@ void hg_settingdialog::createUI()
|
|||
m_paperSizeValue = m_list_defaultOptions.at(i).second.toString();
|
||||
}
|
||||
|
||||
if (0 == strcmp(opt->name, KNOWN_OPT_NAME_CUSTOM_AREA_LEFT))
|
||||
if (0 == strcmp(opt->name, SANE_STD_OPT_NAME_CUSTOM_AREA_LEFT))
|
||||
{
|
||||
m_cutLeftId = i + 1;
|
||||
m_cutLeftValue = SANE_UNFIX(m_list_defaultOptions.at(i).second.toInt());
|
||||
if (opt->constraint_type == SANE_CONSTRAINT_RANGE)
|
||||
m_cutWidth = SANE_UNFIX(opt->constraint.range->max);
|
||||
}
|
||||
else if (0 == strcmp(opt->name, KNOWN_OPT_NAME_CUSTOM_AREA_TOP))
|
||||
else if (0 == strcmp(opt->name, SANE_STD_OPT_NAME_CUSTOM_AREA_TOP))
|
||||
{
|
||||
m_cutTopId = i + 1;
|
||||
m_cutTopValue = SANE_UNFIX(m_list_defaultOptions.at(i).second.toInt());
|
||||
if (opt->constraint_type == SANE_CONSTRAINT_RANGE)
|
||||
m_cutHeight = SANE_UNFIX(opt->constraint.range->max);
|
||||
}
|
||||
else if (0 == strcmp(opt->name, KNOWN_OPT_NAME_CUSTOM_AREA_RIGHT))
|
||||
else if (0 == strcmp(opt->name, SANE_STD_OPT_NAME_CUSTOM_AREA_RIGHT))
|
||||
{
|
||||
m_cutRightId = i + 1;
|
||||
m_cutRightValue = SANE_UNFIX(m_list_defaultOptions.at(i).second.toInt());
|
||||
}
|
||||
else if (0 == strcmp(opt->name, KNOWN_OPT_NAME_CUSTOM_AREA_BOTTOM))
|
||||
else if (0 == strcmp(opt->name, SANE_STD_OPT_NAME_CUSTOM_AREA_BOTTOM))
|
||||
{
|
||||
m_cutBottomId = i + 1;
|
||||
m_cutBottomValue = SANE_UNFIX(m_list_defaultOptions.at(i).second.toInt());
|
||||
|
|
Loading…
Reference in New Issue