summaryrefslogtreecommitdiff
path: root/backend/canon_dr.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-03-30 21:30:45 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-03-30 21:30:45 +0200
commitee770c2346eb37e0dcb8b6cf3eaacf3d8efd6bbc (patch)
tree58f05092be1a17a939e861f8cadcda1b6ca2ecef /backend/canon_dr.h
parent0da9e21872802cfc6e975b1ebaf9efb9e5934d84 (diff)
parentfef76e17ed4c607ea73b81279f9ef1d7121be900 (diff)
Merge branch 'release/experimental/1.0.29-1_experimental1'experimental/1.0.29-1_experimental1
Diffstat (limited to 'backend/canon_dr.h')
-rw-r--r--backend/canon_dr.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/backend/canon_dr.h b/backend/canon_dr.h
index d96fbba..4ffb360 100644
--- a/backend/canon_dr.h
+++ b/backend/canon_dr.h
@@ -1,12 +1,12 @@
#ifndef CANON_DR_H
#define CANON_DR_H
-/*
+/*
* Part of SANE - Scanner Access Now Easy.
* Please see opening comments in canon_dr.c
*/
-/* -------------------------------------------------------------------------
+/* -------------------------------------------------------------------------
* This option list has to contain all options for all scanners supported by
* this driver. If a certain scanner cannot handle a certain option, there's
* still the possibility to say so, later.
@@ -49,6 +49,7 @@ enum scanner_Option
OPT_DROPOUT_COLOR_B,
OPT_BUFFERMODE,
OPT_SIDE,
+ OPT_HW_CROP,
/*sensor group*/
OPT_SENSOR_GROUP,
@@ -89,7 +90,7 @@ struct img_params
int Bpl; /* in bytes */
int valid_width; /*some machines have black padding*/
- int valid_Bpl;
+ int valid_Bpl;
/* done yet? */
int eof[2];
@@ -183,9 +184,10 @@ struct scanner
int has_df;
int has_df_ultra;
int has_btc;
- int has_ssm; /* older scanners use this set scan mode command */
+ int has_ssm; /* older scanners use this set scan mode command */
int has_ssm2; /* newer scanners user this similar command */
int has_ssm_pay_head_len; /* newer scanners put the length twice in ssm */
+ int has_hwcrop;
int can_read_sensors;
int can_read_panel;
int can_write_panel;
@@ -286,6 +288,7 @@ struct scanner
int swcrop;
int swskip;
int stapledetect;
+ int hwcrop;
/* --------------------------------------------------------------------- */
/* values which are derived from setting the options above */
@@ -454,8 +457,8 @@ enum {
#define DUPLEX_INTERLACE_2510 3
#define DUPLEX_INTERLACE_fFBb 4
-#define JPEG_INTERLACE_ALT 0
-#define JPEG_INTERLACE_NONE 1
+#define JPEG_INTERLACE_ALT 0
+#define JPEG_INTERLACE_NONE 1
#define CROP_RELATIVE 0
#define CROP_ABSOLUTE 1