button属性不支持auto; add log when initialize options and remove restore at open, the action done when add to device option object
This commit is contained in:
parent
123e40b648
commit
88daa18a1f
File diff suppressed because one or more lines are too long
|
@ -893,6 +893,7 @@ scanner_err hg_scanner_mgr::hg_scanner_open(scanner_handle* h, const char* name,
|
||||||
utils::to_log(LOG_LEVEL_DEBUG, "%s", msg);
|
utils::to_log(LOG_LEVEL_DEBUG, "%s", msg);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
utils::to_log(LOG_LEVEL_DEBUG, "---Initialize device options ...\n");
|
||||||
if (ptr->dev_opts)
|
if (ptr->dev_opts)
|
||||||
ptr->dev_opts->clear();
|
ptr->dev_opts->clear();
|
||||||
else
|
else
|
||||||
|
@ -900,11 +901,11 @@ scanner_err hg_scanner_mgr::hg_scanner_open(scanner_handle* h, const char* name,
|
||||||
ptr->dev_opts->add(dynamic_cast<sane_opt_provider*>(offline_));
|
ptr->dev_opts->add(dynamic_cast<sane_opt_provider*>(offline_));
|
||||||
ptr->dev_opts->add(dynamic_cast<sane_opt_provider*>(g_language));
|
ptr->dev_opts->add(dynamic_cast<sane_opt_provider*>(g_language));
|
||||||
ptr->dev_opts->add(ptr->scanner);
|
ptr->dev_opts->add(ptr->scanner);
|
||||||
ptr->dev_opts->restore(ptr->scanner);
|
|
||||||
|
|
||||||
ptr->imgproc = create_image_processor(ptr->dev_opts);
|
ptr->imgproc = create_image_processor(ptr->dev_opts);
|
||||||
ptr->scanner->set_image_processor(ptr->imgproc);
|
ptr->scanner->set_image_processor(ptr->imgproc);
|
||||||
ptr->dev_opts->add(ptr->imgproc);
|
ptr->dev_opts->add(ptr->imgproc);
|
||||||
|
utils::to_log(LOG_LEVEL_DEBUG, "---Initialize %d device options OVER.\n", ptr->dev_opts->count());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue