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/pixma_common.c | |
| parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
| parent | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/pixma_common.c')
| -rw-r--r-- | backend/pixma_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/pixma_common.c b/backend/pixma_common.c index 2882453..82c4fde 100644 --- a/backend/pixma_common.c +++ b/backend/pixma_common.c @@ -1,6 +1,6 @@ /* SANE - Scanner Access Now Easy. - Copyright (C) 2011-2016 Rolf Bensch <rolf at bensch hyphen online dot de> + Copyright (C) 2011-2019 Rolf Bensch <rolf at bensch hyphen online dot de> Copyright (C) 2007-2008 Nicolas Martin, <nicols-guest at alioth dot debian dot org> Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de> @@ -933,7 +933,7 @@ pixma_read_image (pixma_t * s, void *buf, unsigned len) if (result == 0) { /* end of image? */ s->ops->finish_scan (s); - if (s->cur_image_size != s->param->image_size) + if ((s->cur_image_size != s->param->image_size) && !s->param->mode_jpeg) { pixma_dbg (1, "WARNING:image size mismatches\n"); pixma_dbg (1, @@ -947,7 +947,7 @@ pixma_read_image (pixma_t * s, void *buf, unsigned len) "BUG:received data not multiple of line_size\n"); } } - if (s->cur_image_size < s->param->image_size) + if ((s->cur_image_size < s->param->image_size) && !s->param->mode_jpeg) { s->underrun = 1; ib.wptr = fill_pixels (s, ib.wptr, ib.wend, 0xff); |