summaryrefslogtreecommitdiff
path: root/backend/canon_pp-dev.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-31 17:00:58 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-31 17:00:58 +0200
commitd087d778ffb62e2713cb848540bcc819470365bd (patch)
treed69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/canon_pp-dev.h
parentc8bd2513ecba169cff44c09c8058c36987357b18 (diff)
parent3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/canon_pp-dev.h')
-rw-r--r--backend/canon_pp-dev.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/backend/canon_pp-dev.h b/backend/canon_pp-dev.h
index e8f36a8..4ad2e45 100644
--- a/backend/canon_pp-dev.h
+++ b/backend/canon_pp-dev.h
@@ -42,7 +42,7 @@
canon_pp-dev.h: $Revision$
- This file is part of the canon_pp backend, supporting Canon FBX30P
+ This file is part of the canon_pp backend, supporting Canon FBX30P
and NX40P scanners and also part of the stand-alone driver.
Simon Krix <kinsei@users.sourceforge.net>
@@ -105,9 +105,9 @@ typedef struct scanner_parameter_struct
int max_xresolution;
int max_yresolution;
- /* ID String. Should only be 38(?) bytes long, so we can
+ /* ID String. Should only be 38(?) bytes long, so we can
reduce the size later. */
- char id_string[80];
+ char id_string[80];
/* Short, readable scanner name, such as "FB330P" */
char name[40];
@@ -120,7 +120,7 @@ typedef struct scanner_parameter_struct
unsigned long *blueweight;
/* Not understood white-balance/gain values */
- unsigned char gamma[32];
+ unsigned char gamma[32];
/* Type of scanner ( 0 = *20P, 1 = [*30P|*40P] ) */
unsigned char type;
@@ -154,7 +154,7 @@ typedef struct image_segment_struct
/* Scan-related functions ========================= */
-/* Brings the scanner in and out of transparent mode
+/* Brings the scanner in and out of transparent mode
and detects model information */
int sanei_canon_pp_initialise(scanner_parameters *sp, int mode);
int sanei_canon_pp_close_scanner(scanner_parameters *sp);
@@ -162,7 +162,7 @@ int sanei_canon_pp_close_scanner(scanner_parameters *sp);
/* Image scanning functions */
int sanei_canon_pp_init_scan(scanner_parameters *sp, scan_parameters *scanp);
-int sanei_canon_pp_read_segment(image_segment **dest, scanner_parameters *sp,
+int sanei_canon_pp_read_segment(image_segment **dest, scanner_parameters *sp,
scan_parameters *scanp, int scanline_count, int do_adjust,
int scanlines_left);