diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-02-01 15:25:04 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-02-01 15:25:04 +0100 |
| commit | 8e5d399808d2270ae9d56c96560a021e594d18a4 (patch) | |
| tree | cb83e4c8216cf0e8bcaa17a6f2cb64cf4d7f469a /backend/pixma | |
| parent | 97e55bdc5cdf59304af739e65f416320bcbcf599 (diff) | |
| parent | 302276dc1b90cfc972fb726ca94a23b18f4b0088 (diff) | |
Update upstream source from tag 'upstream/1.1.1'
Update to upstream version '1.1.1'
with Debian dir 4cb81ae9eaa2503b9c320ac1e8125f9df6e7f7b3
Diffstat (limited to 'backend/pixma')
| -rw-r--r-- | backend/pixma/pixma.c | 2 | ||||
| -rw-r--r-- | backend/pixma/pixma_common.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/backend/pixma/pixma.c b/backend/pixma/pixma.c index b4e423d..31e71f0 100644 --- a/backend/pixma/pixma.c +++ b/backend/pixma/pixma.c @@ -1661,7 +1661,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize) if (!version_code) return SANE_STATUS_INVAL; myversion = 100 * PIXMA_VERSION_MAJOR + PIXMA_VERSION_MINOR; - *version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, myversion); + *version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, myversion); DBG_INIT (); sanei_thread_init (); pixma_set_debug_level (DBG_LEVEL); diff --git a/backend/pixma/pixma_common.c b/backend/pixma/pixma_common.c index 6bce4bc..24912b8 100644 --- a/backend/pixma/pixma_common.c +++ b/backend/pixma/pixma_common.c @@ -968,16 +968,16 @@ pixma_read_image (pixma_t * s, void *buf, unsigned len) s->last_source = s->param->source; if ((s->cur_image_size != s->param->image_size) && !s->param->mode_jpeg) { - pixma_dbg (1, "WARNING:image size mismatches\n"); - pixma_dbg (1, + PDBG (pixma_dbg (1, "WARNING:image size mismatches\n")); + PDBG (pixma_dbg (1, " %"PRIu64" expected (%d lines) but %"PRIu64" received (%"PRIu64" lines)\n", s->param->image_size, s->param->h, s->cur_image_size, - s->cur_image_size / s->param->line_size); + s->cur_image_size / s->param->line_size)); if ((s->cur_image_size % s->param->line_size) != 0) { - pixma_dbg (1, - "BUG:received data not multiple of line_size\n"); + PDBG (pixma_dbg (1, + "BUG:received data not multiple of line_size\n")); } } if ((s->cur_image_size < s->param->image_size) && !s->param->mode_jpeg) |