summaryrefslogtreecommitdiff
path: root/backend/canon_dr.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-08-24 18:44:51 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-08-24 18:44:51 +0200
commitad38bc6ecb80ddeb562841b33258dd53659b1da6 (patch)
treee02e9c3ff760554fd87f70df0e18b88594091a48 /backend/canon_dr.c
parent9c23ed018d72eed2554f4f9cff1ae6e6bb0cd479 (diff)
New upstream version 1.0.31upstream/1.0.31
Diffstat (limited to 'backend/canon_dr.c')
-rw-r--r--backend/canon_dr.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/backend/canon_dr.c b/backend/canon_dr.c
index f6cd5d4..17ee7b6 100644
--- a/backend/canon_dr.c
+++ b/backend/canon_dr.c
@@ -3951,10 +3951,12 @@ get_pixelsize(struct scanner *s)
in, &inLen
);
- if(ret == SANE_STATUS_GOOD &&
- get_R_PSIZE_width(in) > 0 &&
- get_R_PSIZE_length(in) > 0){
+ if(ret != SANE_STATUS_GOOD){
+ DBG (10, "get_pixelsize: error reading, status = %d\n", ret);
+ break;
+ }
+ if(get_R_PSIZE_width(in) > 0 && get_R_PSIZE_length(in) > 0){
DBG (15, "get_pixelsize: w:%d h:%d\n",
get_R_PSIZE_width(in) * s->u.dpi_x / 1200,
get_R_PSIZE_length(in) * s->u.dpi_y / 1200);