diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
| commit | d087d778ffb62e2713cb848540bcc819470365bd (patch) | |
| tree | d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/hp-option.c | |
| parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
| parent | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/hp-option.c')
| -rw-r--r-- | backend/hp-option.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/backend/hp-option.c b/backend/hp-option.c index ba799b7..f4d23f8 100644 --- a/backend/hp-option.c +++ b/backend/hp-option.c @@ -851,16 +851,19 @@ _probe_resolution (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset, if ( (sanei_hp_device_probe (&compat, scsi) == SANE_STATUS_GOOD) && (compat & HP_COMPAT_PS) ) - {int val, mi, ma; + { + int val, mi, ma; - if ( (sanei_hp_scl_inquire(scsi, SCL_MEDIA, &val, &mi, &ma) + if ( (sanei_hp_scl_inquire(scsi, SCL_MEDIA, &val, &mi, &ma) == SANE_STATUS_GOOD) - && ((val == HP_MEDIA_SLIDE) || (val == HP_MEDIA_NEGATIVE)) ) - quant = 300; - minval = (minval+quant-1)/quant; - minval *= quant; - maxval = (maxval+quant-1)/quant; - maxval *= quant; + && ((val == HP_MEDIA_SLIDE) || (val == HP_MEDIA_NEGATIVE)) ) + { + quant = 300; + minval = (minval+quant-1)/quant; + minval *= quant; + maxval = (maxval+quant-1)/quant; + maxval *= quant; + } } DBG(5, "_probe_resolution: set range %d..%d, quant=%d\n",minval,maxval,quant); @@ -2431,7 +2434,7 @@ _program_scan_type (HpOption this, HpScsi scsi, HpOptSet optset, HpData data) sanei_hp_scl_set(scsi, SCL_TONE_MAP, -1); /* Select tone map */ } } - + return SANE_STATUS_GOOD; } |