diff options
| author | Matej Vela <vela@debian.org> | 2016-07-22 09:33:02 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2017-10-02 09:44:50 +0200 |
| commit | 2933b2006d77975ee00aa9c0b0fee15b2ca867f2 (patch) | |
| tree | fc6408b3ba7cc8be4731a20af32cf27f83bf7235 | |
| parent | 9d902ca60b879f67952db61e1ed229e8459a373c (diff) | |
Fix "duplex descriptor uninitialized"
Closes: #583273
Patch-Name: hpaio-option-duplex.diff
| -rw-r--r-- | scan/sane/sclpml.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/scan/sane/sclpml.c b/scan/sane/sclpml.c index 9a5975f32..61500da57 100644 --- a/scan/sane/sclpml.c +++ b/scan/sane/sclpml.c @@ -1084,20 +1084,17 @@ static void init_options( hpaioScanner_t hpaio ) hpaio->option[OPTION_ADF_MODE].constraint_type = SANE_CONSTRAINT_STRING_LIST; hpaio->option[OPTION_ADF_MODE].constraint.string_list = hpaio->adfModeList; - // Duplex scanning is supported - if (hpaio->supportsDuplex == 1) - { - hpaio->option[OPTION_DUPLEX].name = STR_NAME_DUPLEX; - hpaio->option[OPTION_DUPLEX].title = STR_TITLE_DUPLEX; - hpaio->option[OPTION_DUPLEX].desc = STR_DESC_DUPLEX; - hpaio->option[OPTION_DUPLEX].type = SANE_TYPE_BOOL; - hpaio->option[OPTION_DUPLEX].unit = SANE_UNIT_NONE; - hpaio->option[OPTION_DUPLEX].size = sizeof( SANE_Bool ); - hpaio->option[OPTION_DUPLEX].cap = SANE_CAP_SOFT_SELECT | + hpaio->option[OPTION_DUPLEX].name = STR_NAME_DUPLEX; + hpaio->option[OPTION_DUPLEX].title = STR_TITLE_DUPLEX; + hpaio->option[OPTION_DUPLEX].desc = STR_DESC_DUPLEX; + hpaio->option[OPTION_DUPLEX].type = SANE_TYPE_BOOL; + hpaio->option[OPTION_DUPLEX].unit = SANE_UNIT_NONE; + hpaio->option[OPTION_DUPLEX].size = sizeof( SANE_Bool ); + hpaio->option[OPTION_DUPLEX].cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT | SANE_CAP_ADVANCED; - hpaio->option[OPTION_DUPLEX].constraint_type = SANE_CONSTRAINT_NONE; - } + hpaio->option[OPTION_DUPLEX].constraint_type = SANE_CONSTRAINT_NONE; + hpaio->option[GROUP_GEOMETRY].title = STR_TITLE_GEOMETRY; hpaio->option[GROUP_GEOMETRY].type = SANE_TYPE_GROUP; hpaio->option[GROUP_GEOMETRY].cap = SANE_CAP_ADVANCED; |