From 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 31 Jul 2019 16:59:49 +0200
Subject: New upstream version 1.0.28

---
 backend/pixma_common.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'backend/pixma_common.c')

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);
-- 
cgit v1.2.3