m. allan noah
d289b42ad7
Merge branch 'p208ii' into 'master'
...
canon_dr: update P-208II status, add second mode
See merge request sane-project/backends!499
2020-08-01 12:10:17 +00:00
Olaf Meeuwissen
7a3e090efc
Merge branch 'master' into 'master'
...
Mark PLANon DocuPen RC800 as supported by gPhoto2.
See merge request sane-project/backends!489
2020-08-01 06:15:30 +00:00
Olaf Meeuwissen
7056b4826b
Merge branch 'mingw-fixes' into 'master'
...
MinGW build fixes
See merge request sane-project/backends!483
2020-08-01 06:14:15 +00:00
Olaf Meeuwissen
a277ea5ff1
Merge branch '279-issue02-null-pointer-deref-epsonds_net_read' into 'master'
...
Resolve "memory corruption bugs in libsane"
See merge request sane-project/backends!500
2020-08-01 03:45:15 +00:00
Olaf Meeuwissen
8e21bd5806
epsonds: Read whole payload of welcome message
2020-08-01 12:28:00 +09:00
Olaf Meeuwissen
6c07abf763
epsonds: Rewrite network I/O
...
This follows the changes made to the epson2 backend and addresses
GHSL-2020-079, GHSL-2020-080 and GHSL-2020-081. Re #279 .
2020-08-01 12:28:00 +09:00
m. allan noah
e44672cdf8
Merge branch 'canon_dr/fix_get_pixelsize' into 'master'
...
canon_dr: Report early error
See merge request sane-project/backends!333
2020-08-01 01:10:17 +00:00
Florian Klink
72d09e0bfa
canon_dr: update P-208II status, add second mode
2020-07-29 15:01:19 +02:00
Ralph Little
be666bb037
Merge branch '6-gt68xx-scanimage-batch-segfault' into 'master'
...
Resolve "gt68xx scanimage --batch segfault"
Closes #6
See merge request sane-project/backends!498
2020-07-27 14:38:12 +00:00
pimvantend
08790ef7cb
lide 600 support promised in man-page
2020-07-27 12:45:07 +02:00
Ralph Little
5dd9eeb083
gt68xx: Restore cancel "stop_scan" call and fix whitespace issue
...
The original issue that I had with this patch was in the cancel function
where the patch author had commented out the "stop scan" call for cancel.
This made no sense to me. I have put it back in for testing.
It might have been accidentally left out.
2020-07-26 11:19:31 -07:00
Ralph Little
462419cc68
gt68xx: Initial check-in of proposed patch for crash.
...
Ulf and I will review and test this patch on this branch.
It does seem to fix the issue, but I want to check it out a little more
before we commit it to master.
2020-07-26 11:02:40 -07:00
Ralph Little
1b9e701605
Merge branch 'en_GB-translations-update' into 'master'
...
po: Updated en_GB translations.
See merge request sane-project/backends!497
2020-07-26 17:53:48 +00:00
Ralph Little
1bd4fc283a
po: Updated en_GB translations.
2020-07-26 10:35:04 -07:00
Ralph Little
f29bbab5fa
Merge branch 'hp5400-fix-option-warning-bug' into 'master'
...
hp5400: initialize options bit mask to avoid compiler warning and glitchy operation
See merge request sane-project/backends!496
2020-07-26 17:19:15 +00:00
Ralph Little
37bc4598a2
hp5400: initialize options bit mask to avoid compiler warning and glitchy operation
...
This was picked up as a compiler warning in Ubuntu build and was a
real functional issue.
2020-07-26 10:00:48 -07:00
Olaf Meeuwissen
21a3bfad71
Merge branch 'for-upstream/backend_avision_i1120' into 'master'
...
backend/avision: support for Kodak i1120
See merge request sane-project/backends!19
2020-07-26 12:20:04 +00:00
Michael Niewöhner
7f8acc8534
backend/avision: i1120: add description entry
...
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:20:03 +02:00
Michael Niewöhner
e8ae2ca16f
backend/avision: fix: use fabs instead of abs for double values
...
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:20:03 +02:00
Michael Niewöhner
fa6dfcc44e
backend/avision: i1120: finally set correct offsets for duplex
...
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:19:56 +02:00
Michael Niewöhner
7d7184a209
backend/avision: add missing offsets for bry
...
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:19:12 +02:00
Michael Niewöhner
6a6927b198
backend/avision: implement ADF first-sheet offset compensation
...
i1120 has another offset. When scanning in ADF multi-page mode (the
default), the very first sheet is moved 1.5mm down. That leads to 1.5mm
being cut off at the bottom.
This implements the (hopefully last) offset setting for multi-sheet ADF
scans.
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:07 +02:00
Michael Niewöhner
e96ce8887e
backend/avision: add ADF front-only offset compensation
...
This adds offset compensation for ADF front-only scans, which may
have different offsets than ADF duplex scans.
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:07 +02:00
Michael Niewöhner
58a3cdd042
backend/avision: Rewrite offset compensation
...
This is a complete rewrite of the offset compensation using a
combination of overscan and line skipping. It replaces the option
AV_REAR_OFFSET by specifying exact offset values for each scanner.
This was needed for Kodak i1120 which needs bottom line skipping.
The old implementation could not skip bottom lines since we could
not know how many lines we will get in the end from ADF.
The new implementation redirects the output file descriptor to a
temporary file. After the current page is completely scanned,
offsets are applied and the output is passed to the original
output file descriptor.
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:07 +02:00
Michael Niewoehner
b4716f6264
backend/avision: i1120: Add option AV_MULTI_SHEET_SCAN
...
Kodak i1120 has single-sheet and multi-sheet scan modes. This option sets
bitset3[7] which enables multi-sheet scan by default so there is no pause
of 1s between two sheets in ADF scan mode. This also fixes some offsets
when scanning multiple sheets.
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:06 +02:00
Michael Niewoehner
e54c9602e9
backend/avision: i1120: add option AV_GAMMA_UINT16
...
Kodak i1120 has a different gamma table format that looks like a
uint16/double array. Implement it and add an option for it.
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:06 +02:00
Michael Niewoehner
d8bf392424
backend/avision: i1120: add option AV_GAMMA_10
...
Kodak i1120 needs gamma to be set to 1.0 to give decent scan results.
Add an option for this.
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:06 +02:00
Michael Niewoehner
886bf85d88
backend/avision: i1120: add option AV_NO_QCALIB_MODE
...
i1120 does not have an explicit "quality-calibration" mode. Add an
option to disable this mode.
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:06 +02:00
Michael Niewoehner
de19ebc61a
backend/avision: i1120: add option AV_FASTFEED_ON_CANCEL
...
Some scanners like i1120 support fast feed-out of the sheet when
cancelling a running scan. Add a new option for this release type.
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:06 +02:00
Michael Niewoehner
8b467b248e
backend/avision: i1120: set AV_NO_REAR
...
Kodak broke rear-only scan (bitset3[3]) when they modified the Avision
firmware. It would be possible to add a work-around that drops front data and
writes rear data only. Because of deinterlacing, offsets etc. this is way too
complicated. The simpliest solution to scan rear-only is to turn around the
paper stack and use front scan instead.
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:06 +02:00
Michael Niewoehner
692f87389b
backend/avision: i1120: add option AV_OVERSCAN_OPTDPI
...
i1120 uses optical DPI for overscan calculation. Add an option for it.
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:06 +02:00
Michael Niewoehner
74e94e6901
backend/avision: i1120: add option AV_NO_QSCAN_MODE
...
i1120 does not have an explicit quality-scan mode. Add an option to disable it.
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:06 +02:00
Michael Niewoehner
aff30cbb21
backend/avision: ability[3] seems to be a typo since ability[2] is dark cal indicator
...
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:06 +02:00
Michael Niewoehner
de1a873cb7
backend/avision: i1120: use AV_SOFT_SCALE
...
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:06 +02:00
Michael Niewoehner
c1c8ee8ea6
backend/avision: i1120: Enable gray filter to match windows driver
...
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:06 +02:00
Michael Niewoehner
f393f8f246
backend/avision: i1120: add option AV_FORCE_CALIB
...
Add option AV_FORCE_CALIB to force calibration when scanner claims it is
not needed but it is.
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:06 +02:00
Michael Niewoehner
196ce0b046
backend/avision: Add basic support for KODAK i1120
...
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
2020-07-26 12:16:06 +02:00
Olaf Meeuwissen
890eb452b9
Merge branch 'Add-gamma-tables-to-test-backend' into 'master'
...
Add gamma test options
See merge request sane-project/backends!301
2020-07-26 09:39:23 +00:00
Kåre Särs
5683aab66b
Add gamma test options
2020-07-26 09:39:23 +00:00
Olaf Meeuwissen
f06c18b7ae
Merge branch 'french-translation-revision' into 'master'
...
Update French translation
See merge request sane-project/backends!494
2020-07-26 09:10:21 +00:00
Ordissimo
8bb62701c1
Update fr.po
2020-07-24 21:53:26 +00:00
Thierry HUCHARD
0ca69fdc2e
Update French translation
2020-07-24 12:33:25 +02:00
m. allan noah
e7fc728e28
fujitsu: add USB IDs for fi-7800 and fi-7900
2020-07-18 21:12:52 -04:00
Rolf Bensch
8bdd27d149
pixma: remove auto generated files @ 'make clean'
...
See merge request sane-project/backends!491
2020-07-14 19:36:17 +02:00
Rolf Bensch
e390b351a0
pixma: backend version 0.28.3
2020-07-14 18:10:45 +02:00
Rolf Bensch
f1ebc352ae
pixma: update man page
2020-07-14 18:10:45 +02:00
Rolf Bensch
bc81490996
Merge branch '302-pixma-status-of-pixma-tr-4500-series' into 'master'
...
Resolve "pixma: Status of PIXMA TR 4500 Series"
Closes #302
See merge request sane-project/backends!485
2020-07-14 15:57:31 +00:00
Rolf Bensch
1da5ae889a
pixma: add new button options
...
some scanners return more options from push-button:
document-type, adf-status and adf-orientation
2020-07-14 17:39:18 +02:00
Rolf Bensch
b8cf6b4b49
pixma: TR4500 Series is working
2020-07-14 17:37:59 +02:00
Rolf Bensch
ec918e5c74
pixma: TR4500 Series supports max. 600dpi
2020-07-14 17:28:06 +02:00