diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-10-08 12:33:06 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-10-08 12:33:06 +0200 |
commit | 24feb9f37f302c006ba51502da817325200e74d0 (patch) | |
tree | d4451782449e5fcbae9cbe3778c51a8c6cb3c36d /backend/microtek2.c | |
parent | 76b69ebb381d40458339c9940135740797cbd2d4 (diff) | |
parent | cfd27ef2ad8b005fd47ab41ef29b71d9e3d48201 (diff) |
Merge tag 'upstream/1.0.25'
Upstream version 1.0.25
Diffstat (limited to 'backend/microtek2.c')
-rw-r--r-- | backend/microtek2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/microtek2.c b/backend/microtek2.c index d56e568..8fdf497 100644 --- a/backend/microtek2.c +++ b/backend/microtek2.c @@ -4013,7 +4013,7 @@ get_scan_mode_and_depth(Microtek2_Scanner *ms, /* This function translates the strings for the possible modes and */ /* bitdepth into a more conveniant format as needed for SET WINDOW. */ /* bits_per_pixel is the number of bits per color one pixel needs */ - /* when transferred from the the scanner, bits_perpixel_out is the */ + /* when transferred from the scanner, bits_perpixel_out is the */ /* number of bits per color one pixel uses when transferred to the */ /* frontend. These may be different. For example, with a depth of 4 */ /* two pixels per byte are transferred from the scanner, but only one */ @@ -7453,7 +7453,7 @@ segreg_proc_data(Microtek2_Scanner *ms) save_current_src = ms->buf.current_src; if ( ms->buf.free_lines < ms->src_max_lines ) { - ms->buf.current_src = ++ms->buf.current_src % 2; + ms->buf.current_src = !ms->buf.current_src; ms->buf.src_buf = ms->buf.src_buffer[ms->buf.current_src]; ms->buf.free_lines = ms->buf.free_max_lines; } |