diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 16:59:49 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 16:59:49 +0200 |
| commit | 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f (patch) | |
| tree | d78102ce30207c63e7608eeba743efd680c888dc /backend/pixma.h | |
| parent | 58912f68c2489bcee787599837447e0d64dfd61a (diff) | |
New upstream version 1.0.28upstream/1.0.28
Diffstat (limited to 'backend/pixma.h')
| -rw-r--r-- | backend/pixma.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/backend/pixma.h b/backend/pixma.h index 6d723fb..370203a 100644 --- a/backend/pixma.h +++ b/backend/pixma.h @@ -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> @@ -104,7 +104,7 @@ typedef uint16_t uint16_t; typedef uint32_t uint32_t; #endif /* HAVE_STDINT_H */ -#ifdef HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include <inttypes.h> /* available in ISO C99 */ #endif /* HAVE_INTTYPES_H */ @@ -116,8 +116,8 @@ typedef uint32_t uint32_t; /** \name Version of the driver */ /**@{*/ #define PIXMA_VERSION_MAJOR 0 -#define PIXMA_VERSION_MINOR 17 -#define PIXMA_VERSION_BUILD 37 +#define PIXMA_VERSION_MINOR 23 +#define PIXMA_VERSION_BUILD 0 /**@}*/ /** \name Error codes */ @@ -154,6 +154,7 @@ typedef uint32_t uint32_t; #define PIXMA_CAP_NEGATIVE (1 << 10) #define PIXMA_CAP_TPUIR ((1 << 11) | PIXMA_CAP_TPU) #define PIXMA_CAP_ADF_WAIT (1 << 12) +#define PIXMA_CAP_ADF_JPEG (1 << 13) #define PIXMA_CAP_EXPERIMENT (1 << 31) /**@}*/ @@ -278,7 +279,7 @@ struct pixma_scan_param_t * line_size >= depth / 8 * channels * w <br> * This field will be set by pixma_check_scan_param(). */ uint64_t line_size; - + /** Size in bytes of the whole image. * image_size = line_size * h <br> * This field will be set by pixma_check_scan_param(). */ @@ -310,11 +311,14 @@ struct pixma_scan_param_t unsigned x, y, w, h, xs, wx; /*@} */ - /** Flag indicating whether the offset correction for TPU scans + /** Flag indicating whether the offset correction for TPU scans * was already performed (to avoid repeated corrections). * Currently only used in pixma_mp810.c sub-driver */ unsigned tpu_offset_added; + /* Flag indicating if data from scanner will be in JPEG format */ + unsigned mode_jpeg; + /** Flag indicating whether a software-lineart scan is in progress * 0 = other scan * 1 = software-lineart scan */ |