mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
11 446 Commity
33 Gałęzie
59 Tagi
58 MiB
Wykres commitów

5693 Commity (edace214b25766860dc3f71a4201fca9f052e5c4)

Autor SHA1 Wiadomość Data
Thierry HUCHARD 296e73ae6b escl get sane_cancel output 2020-05-09 15:42:33 +02:00
Thierry HUCHARD f233792702 Update Adf status. 2020-05-09 10:03:39 +02:00
Thierry HUCHARD c4d8cc424e Update Adf status. 2020-05-09 09:50:15 +02:00
Povilas Kanapickas 4691b92d80 genesys: Simplify motor profile selection on gl841 2020-05-09 10:38:42 +03:00
Povilas Kanapickas ae8cb155ef genesys: Simplify register setup on gl841 2020-05-09 10:38:41 +03:00
Povilas Kanapickas b1b61b043b genesys: Pass whole motor struct to create_slope_table() 2020-05-09 10:34:41 +03:00
Povilas Kanapickas fe3677b68f genesys; Rename create_slope_table{=>_speed}() 2020-05-09 10:34:40 +03:00
Povilas Kanapickas dcb90dc042 genesys: Simplify handling of output line count on gl646 2020-05-09 04:10:17 +03:00
Povilas Kanapickas 46d3ea07d4 genesys: Use DISABLE_GAMMA fla to control GMMENB bit on gl646 2020-05-09 04:10:16 +03:00
Povilas Kanapickas 35544b0c36 genesys: Simplify init_regs_for_shading() on gl646 2020-05-09 04:10:15 +03:00
Povilas Kanapickas 3dff3a97b3 genesys: Fix invalid movement in simple_move() on gl646 2020-05-09 04:10:14 +03:00
Povilas Kanapickas 84d4d0b15c genesys: Use AUTO_GO_HOME flag to control AGOHOME bit on gl646 2020-05-09 04:10:13 +03:00
Povilas Kanapickas 4b5b2b2f0b genesys: Simplify init_regs_for_warmup() on gl646 2020-05-09 04:10:12 +03:00
Povilas Kanapickas 0bc0f893b2 genesys: Simplify invocation of simple_scan() on gl646 2020-05-09 04:10:11 +03:00
Thierry HUCHARD 73bf5533f9 release memory and close descriptor. 2020-05-08 08:35:50 +02:00
thierry1970 a931e0df57 Refactoring of the adf status. 2020-05-07 19:19:55 +02:00
Olaf Meeuwissen f38c9f0d64 Merge branch 'issue09-esci2-img-buffer-size-check' into '279-confidential-issue' 
epsonds: Prevent possible buffer overflow when reading image data

See merge request paddy-hack/backends!8
 2020-05-07 09:42:42 +00:00
Ordissimo 6689104f01 Merge branch 'fix-status-returned-by-sane-start' into 'master' 
escl: Add support for SANE_STATUS_NO_DOCS and SANE_STATUS_DEVICE_BUSY to sane_start

Closes #283

See merge request sane-project/backends!433
 2020-05-06 18:29:07 +00:00
Ordissimo e8e9577c12 Merge branch 'add-more-logs' into 'master' 
Make curl error message more informative, to help debug issues

See merge request sane-project/backends!431
 2020-05-06 18:10:33 +00:00
Bartosz Kosiorek 878197a00e escl: Add support for SANE_STATUS_NO_DOCS and SANE_STATUS_DEVICE_BUSY to sane_start 
Fixes: #283
 2020-05-06 18:25:44 +02:00
thierry1970 fc14edf69e Fix build. 2020-05-06 16:22:11 +02:00
thierry1970 646ee990d3 Reduces the number of entries on offer. 2020-05-06 16:08:53 +02:00
Bartosz Kosiorek adbbdc8a69 Make curl error message more informative, to help debug issues 2020-05-06 16:01:01 +02:00
thierry1970 c9fdb62060 The duplex tag is only sent to the device if the device supports AdfDuplex. 2020-05-06 10:44:31 +02:00
thierry1970 9b3d7dc8b6 Fix name of sources. 2020-05-06 10:12:52 +02:00
Olaf Meeuwissen 833c25c3ae Merge branch 'inspiration-from-freebsd-patches' into 'master' 
Inspiration from freebsd patches

Closes #291, #290, #289, and #286

See merge request sane-project/backends!425
 2020-05-06 05:58:02 +00:00
Olaf Meeuwissen 3d005c2570 Merge branch 'issue05-out-of-bounds-read-decode_binary' into '279-confidential-issue' 
epsonds: Do not read beyond the end of the token

See merge request paddy-hack/backends!5
 2020-05-06 04:06:49 +00:00
Olaf Meeuwissen 226d9c9289 Merge branch 'issue07-out-of-bounds-read-in-esci2_check_header' into '279-confidential-issue' 
epsonds: Read only up to seven hexdigits to determine payload size

See merge request paddy-hack/backends!6
 2020-05-06 04:05:59 +00:00
Olaf Meeuwissen 02b5d33b7a Merge branch 'issue08-integer-overflow-sanei_tcp_read' into '279-confidential-issue' 
sanei: Integer overflow sanei tcp read

See merge request paddy-hack/backends!7
 2020-05-06 04:04:18 +00:00
Olaf Meeuwissen 4c9e4efd4a Merge branch 'issue01-null-pointer-deref-sanei_epson_net_read' into '279-confidential-issue' 
epson2: Rewrite network I/O

See merge request paddy-hack/backends!3
 2020-05-06 04:03:19 +00:00
Povilas Kanapickas 06ad1dd43f genesys: Inline setup_for_scan() into gl646_repark_head() 2020-05-06 01:29:10 +03:00
Povilas Kanapickas 1b5c31bb01 genesys: Inline setup_for_scan() into init_regs_for_warmup() on gl646 2020-05-06 01:29:09 +03:00
Povilas Kanapickas d7bf809a6c genesys: Inline setup_for_scan() into init_regs_for_shading() on gl646 2020-05-06 01:29:08 +03:00
Povilas Kanapickas 7ba20e43a3 genesys: Simplify simple_scan() on gl646 2020-05-06 01:29:07 +03:00
Povilas Kanapickas f1d6c2c0cd genesys: Inline setup_for_scan into simple_scan on gl646 2020-05-06 01:29:06 +03:00
Thierry HUCHARD 0efee9ddd6 Fix model name cropping. 2020-05-06 00:14:12 +02:00
Thierry HUCHARD cd18ba69de Add vendor 2020-05-06 00:13:37 +02:00
Povilas Kanapickas 644f4b0c94 genesys: Simplify session setup in ad_fe_offset_calibration() on gl646 2020-05-06 01:05:45 +03:00
Povilas Kanapickas 4183f37b46 genesys: Simplify session setup in offset_calibration() on gl646 2020-05-06 01:05:44 +03:00
Povilas Kanapickas e32ca11346 genesys: simplify session setup in ad_fe_coarse_gain_calibration() 2020-05-06 01:05:43 +03:00
Povilas Kanapickas 1f78a2e64c genesys: Simplify session setup in coarse_gain_calibration() on gl646 2020-05-06 01:05:42 +03:00
Povilas Kanapickas e876379f31 genesys: Simplify session in simple_move() on gl646 2020-05-06 01:05:41 +03:00
Povilas Kanapickas 5a2e81b633 genesys: Simplify session setup in led_calibration on gl646 2020-05-06 01:05:40 +03:00
Povilas Kanapickas 09eb07561f genesys: Split simple_scan() into version that accepts ScanSession 2020-05-06 01:05:39 +03:00
Povilas Kanapickas 4f1dad8ca9 genesys: Simplify session setup on gl646 2020-05-06 01:05:38 +03:00
Povilas Kanapickas 99a59d9871 genesys: Remove out of date comment 2020-05-06 01:05:37 +03:00
Thierry HUCHARD 8e2d335653 Put the vendor corresponding to the device used. 2020-05-05 22:29:03 +02:00
Olaf Meeuwissen e18242108e v4l: Drop kernel interface from v4l.h 
It has been included in libv4l1.h since 0.8.3.
 2020-05-05 16:15:13 +09:00
Olaf Meeuwissen 95b4369166 v4l: Prefer C99 standard type over asm __u32. Re #291 2020-05-05 16:14:11 +09:00
Olaf Meeuwissen 9e1acea497 umax_pp: Fix typo. Fixes #290 2020-05-05 13:08:23 +09:00
Olaf Meeuwissen 1a201b28ab ricoh2: Use C99 standard headers 
Inspired by a FreeBSD patch.  Fixes #289.
 2020-05-05 12:55:19 +09:00
Olaf Meeuwissen 9232792e0f epsonds: Add missing header files for socket use. Fixes #286 2020-05-05 12:31:34 +09:00
Ordissimo bd482b6365 Merge branch 'escl-fixe-descriptor-size' into 'master' 
Fixe descriptor size.

See merge request sane-project/backends!424
 2020-05-04 11:39:19 +00:00
thierry1970 2ed753b3fe Fixe descriptor size. 2020-05-04 13:19:03 +02:00
Olaf Meeuwissen 2b4aa45bad Merge branch 'issue11-read_of_uninitialized_data' into '279-confidential-issue' 
magicolor: Added security mediation to device discovery

See merge request paddy-hack/backends!2
 2020-05-04 08:24:19 +00:00
Olaf Meeuwissen fe08bbee6b epsonds: Handle error condition. Re #279, issue 8 2020-05-04 11:48:46 +09:00
Thierry HUCHARD 855cc408d3 Fix the status of the scanner in case of failure. 2020-05-02 11:05:49 +02:00
Thierry HUCHARD 2190739b31 Fixed source argument. 2020-05-01 11:59:58 +02:00
Ralph Little 07e3834127 magicolor: Added security mediation to device discovery 
Extraction of values from the SNMP response were not checked.
Also fixed a bug that mistakenly matched any SNMP OIDs with the
first model in the model list, in function mc_get_device_from_identification().
 2020-04-30 23:21:00 -07:00
Bartosz Kosiorek 24ffce93fd Don't use the uninitialized data during getting capabilities and print capabilities 2020-04-30 22:36:00 +02:00
Olaf Meeuwissen fff83e7eac epson2: Rewrite network I/O 
This addresses GHSL-2020-075 as well as all other problematic code
uncovered as a result of investigating that.  This includes:

- buffer overflows due to use of unchecked lengths
- integer overflows due to type conversions
- potential memory leaks
- checking for memory allocation failures

Re #279.
 2020-04-30 21:21:30 +09:00
Olaf Meeuwissen 27ea994d23 epsonds: Do not read beyond the end of the token 
Addresses GHSL-2020-082, re #279.
 2020-04-30 21:15:45 +09:00
Olaf Meeuwissen b9b0173409 epsonds: Prevent possible buffer overflow when reading image data 
Addresses GHSL-2020-084, re #279.
 2020-04-27 20:24:44 +09:00
Olaf Meeuwissen db9480b09e epsonds: Read only up to seven hexdigits to determine payload size 
Addresses GHSL-2020-083, re #279.
 2020-04-27 20:24:11 +09:00
Ralph Little af0442f15c magicolor: Added security remediation for pixels_per_line. 
This implements a security issue reported by GitHub Security Lab.
The details are disclosed in GitLab issue #279.
The issue relates to an invalid scan parameter block being sent to
the backend containing 8 bytes of 0x00 which leads to pixels_per_line
being set to 0. Later arithmetic involves the division by this value
which causes a div by zero crash.
 2020-04-26 13:04:41 -07:00
Povilas Kanapickas 08b41c052e genesys: Add support for Plustek OpticFilm 7200 2020-04-23 21:36:23 +03:00
Oliver Schwartz 867aeb7d09 Merge branch 'master' into 'master' 
sanei_usb: allow non-configured devices on macOS for libusb-1.x

See merge request sane-project/backends!358
 2020-04-23 14:13:27 +00:00
Povilas Kanapickas e5c371b24b genesys: Merge motor optical_ydpi to base_ydpi 2020-04-22 22:41:45 +03:00
Alex Belkin 40a451b1ac xerox_mfp: Mark Xerox WorkCentre 3225 as supported 
Reported by Darodaros in issue sane-project/website#26.
 2020-04-22 16:15:33 +03:00
Zdenek Dohnal ea8beca57d Fix assertion error in gl841 asic type by lowering steps for fast/back/slow tables 2020-04-22 13:23:41 +02:00
thierry1970 32083172ea Allows you to move to the next page. 2020-04-21 14:49:40 +02:00
thierry1970 111d8d2aab Fix invalide image with scanimage. 2020-04-21 12:47:07 +02:00
Povilas Kanapickas 53162b4cad genesys: Remove no longer used motor action 2020-04-20 00:35:57 +03:00
Povilas Kanapickas af28c2d56c genesys: Reuse scanner_move_back_home() on gl841 2020-04-20 00:35:56 +03:00
Povilas Kanapickas d9b49e567c genesys: Simplify motor direction setup on gl841 2020-04-20 00:35:55 +03:00
Povilas Kanapickas 8412861a66 genesys: Support reverse scan direction on gl841 2020-04-20 00:35:54 +03:00
Povilas Kanapickas f965c2ef25 genesys: Reuse scanner_stop_action() on gl841 2020-04-20 00:35:53 +03:00
Povilas Kanapickas 98ee100237 genesys: Fix scanner_is_motor_stopped() on gl841 2020-04-20 00:35:52 +03:00
Povilas Kanapickas b68fd960e3 genesys: Simplify sensor setup on gl646 2020-04-17 06:19:22 +03:00
Povilas Kanapickas a3ad02c8bf genesys: Remove sensor setting duplication on gl646 2020-04-17 06:19:21 +03:00
Povilas Kanapickas ebfa38a732 genesys: Map motor flags to scan flags 2020-04-17 05:38:47 +03:00
Povilas Kanapickas 4c95e94f9b genesys: Move private functionality out of headers 2020-04-17 05:38:46 +03:00
Povilas Kanapickas afa96a227d genesys: Reduce duplication of sensor setup functionality 2020-04-17 05:38:45 +03:00
Povilas Kanapickas d0855e513b genesys: Remove unused #defines 2020-04-17 05:38:44 +03:00
Povilas Kanapickas edda9bff25 genesys: Simplify creation of command set 2020-04-17 05:38:43 +03:00
Povilas Kanapickas c0deb9b2c4 genesys: Use consistent model name for Canon CanoScan 5600F 2020-04-17 05:38:42 +03:00
Povilas Kanapickas ad4c8f5453 genesys: Reduce duplication in led_calibration 2020-04-17 05:23:07 +03:00
Povilas Kanapickas 4aace34caa genesys: Simplify led calibration on gl841 2020-04-17 05:18:01 +03:00
Povilas Kanapickas f6b606503c genesys: Remove out of date comments on gl841 2020-04-17 05:18:00 +03:00
Povilas Kanapickas 6b49c6656c genesys: Simplify motor setup on gl841 2020-04-17 05:17:59 +03:00
Povilas Kanapickas 2a9254c998 genesys: Verify that all sensors have required registers on gl841 2020-04-17 05:17:58 +03:00
Povilas Kanapickas 608cd18282 genesys: Rewrap custom register lists in sensor definitions on gl841 2020-04-17 05:17:57 +03:00
Povilas Kanapickas 75f5ec4058 genesys: Remove duplicate initialization during scanner setup on gl841 2020-04-17 05:17:56 +03:00
Povilas Kanapickas f37c3c55e4 genesys: Simplify sensor setup on gl841 2020-04-17 05:17:55 +03:00
Rolf Bensch 3ba284eeec pixma: backend version 0.27.7 2020-04-15 21:50:05 +02:00
Rolf Bensch 598b836c05 Merge branch 'k3a-pixma' into 'master' 
pixma: parse XML response sent by the scanner and present tips to the user

Closes issue sane-project/backends#70

See merge request sane-project/backends!386
 2020-04-15 19:47:27 +00:00
Povilas Kanapickas 4d01195d22 Merge branch 'genesys-hp-4850' into 'master' 
genesys: Fix shading offsets on HP 4850

See merge request sane-project/backends!406
 2020-04-14 21:37:03 +00:00
Povilas Kanapickas 0638e84d13 genesys: Fix shading offsets on HP 4850 2020-04-15 00:21:05 +03:00
Povilas Kanapickas 6fc6fb7ea2 genesys: Load calibration data in sane_start() not in sane_init() 2020-04-15 00:16:01 +03:00
Povilas Kanapickas a595875d87 genesys: Bump calibration version 2020-04-15 00:15:21 +03:00
Povilas Kanapickas 7304a4bb78 genesys: Fix out of bounds access during calibration on gl843 2020-04-15 00:15:10 +03:00
Povilas Kanapickas eec083f46a genesys: Remove startup position hack on 4400F 4800dpi scans 2020-04-13 07:38:08 +03:00
Povilas Kanapickas 1125cf338a genesys: Update pixel start offsets on 4400F 2020-04-13 07:38:07 +03:00
Povilas Kanapickas 60da130402 genesys: Fix Y scan area offset on 4400F 2020-04-13 07:38:06 +03:00
Povilas Kanapickas ea781b6b07 genesys: Improve head positioning during calibration on 8600F TA scans 2020-04-13 07:38:05 +03:00
Povilas Kanapickas b788f2de8f genesys: Remove startup position hack on 8600F 4800dpi scans 2020-04-13 07:38:04 +03:00
Povilas Kanapickas aec867d1e8 genesys: Support negative output_pixel_offset 2020-04-13 07:38:03 +03:00
Povilas Kanapickas f03b7ad29f genesys: Fix alignment of transparency scans of different dpi on 8600F 2020-04-13 07:38:02 +03:00
Povilas Kanapickas 82b42862ab genesys: Fix calibration on 8400F 2020-04-13 07:38:01 +03:00
Povilas Kanapickas 6fea625ad6 genesys: Support custom shading offset on gl843 2020-04-13 07:38:00 +03:00
Povilas Kanapickas 4b79620525 genesys: Fix shading resolution on 8400F 400dpi 2020-04-13 07:37:59 +03:00
Povilas Kanapickas 664c07c01a genesys: Add a way to configure shading pixel offset 2020-04-13 07:37:58 +03:00
Povilas Kanapickas df0fccf899 genesys: Fix incorrect handling of start position on gl843 2020-04-13 07:37:57 +03:00
Povilas Kanapickas 922cabc0be genesys: Remove no longer used ccd_start_xoffset 2020-04-13 07:23:43 +03:00
Povilas Kanapickas 87f5637a47 genesys: Cleanup pixel position handling on gl124 2020-04-13 07:23:42 +03:00
Povilas Kanapickas bae938b4be genesys: Use output_pixel_offset for CCD offsets on gl847 2020-04-13 07:23:41 +03:00
Povilas Kanapickas eca7a5ab91 genesys: Use output_pixel_offset for CCD offsets on gl845/gl846 2020-04-13 07:23:40 +03:00
Povilas Kanapickas e5c46aee41 genesys: Use output_pixel_offset for CCD offsets on gl843 2020-04-13 07:23:39 +03:00
Povilas Kanapickas dc00ab867b genesys: Use output_pixel_offset for CCD offsets on gl841 2020-04-13 07:23:38 +03:00
Povilas Kanapickas 648a24830f genesys: Use output_pixel_offset for CCD offsets on gl646 2020-04-13 07:23:37 +03:00
Povilas Kanapickas 1fc00f2b96 Merge branch 'genesys-cleanup-pixel-position-handling' into 'master' 
genesys: Cleanup pixel position handling

See merge request sane-project/backends!401
 2020-04-13 13:33:50 +00:00
Povilas Kanapickas 3693f4b12d genesys: Simplify use of pixel_endx on gl124 2020-04-13 07:19:59 +03:00
Povilas Kanapickas cdefc1cae5 genesys: Simplify pixel position handling on gl646 2020-04-13 07:19:58 +03:00
Povilas Kanapickas e920d1bbce genesys: Add a way to specify output pixel offset 2020-04-13 07:19:57 +03:00
Povilas Kanapickas 94f130cdfa genesys: Simplify pixel position calculation on gl841 2020-04-13 07:19:56 +03:00
Povilas Kanapickas 8b37d4b15e genesys: Remove handling of XCORRECTION on gl646 2020-04-13 07:19:55 +03:00
Povilas Kanapickas 2bec01cf60 genesys: Simplify optical pixel calculations on gl646 2020-04-13 07:19:54 +03:00
Povilas Kanapickas f4b60c48bb genesys: Remove unnecessary pixel averaging handling code on gl841 2020-04-13 07:19:53 +03:00
Povilas Kanapickas 1f43e6a7f8 genesys: Remove unused handling of partial resolutions 2020-04-13 07:19:52 +03:00
Povilas Kanapickas 71f3dd8643 genesys: Make definition of optical_resolution more consistent on gl646 2020-04-13 07:19:51 +03:00
Povilas Kanapickas 6db2f94598 genesys: Remove unused configuration of ccd_size_divisor 2020-04-13 07:19:50 +03:00
Povilas Kanapickas 12269c5ad4 genesys: Prefer not to use ccd_size_divisor on gl841 2020-04-13 07:19:49 +03:00
Povilas Kanapickas 48c377b5f0 genesys: Improve description of SetupParams::pixels 2020-04-13 07:19:48 +03:00
Povilas Kanapickas 901827c8c7 genesys: Disable currently unsupported resolutions on LiDE 700F 2020-04-13 07:19:29 +03:00
Povilas Kanapickas 35e48da4a8 genesys: Fix invalid home position reporting on LiDE 700F 2020-04-13 07:19:28 +03:00
Ordissimo 4c254e3c3d Merge branch 'escl-adf-support' into 'master' 
Escl adf support

See merge request sane-project/backends!300
 2020-04-12 09:01:51 +00:00
Thierry HUCHARD 6a0e0eb568 Fix build 2020-04-12 10:28:55 +02:00
Thierry HUCHARD 3d02d2f1be Changes the status when the trays are empty. 2020-04-12 10:17:33 +02:00
Povilas Kanapickas 7fbc7dda54 genesys: Readd missed comment 2020-04-11 15:50:30 +03:00
Povilas Kanapickas 3b1d7d59c1 Merge branch 'genesys-reg-get-address' into 'master' 
genesys: Remove uses of sanei_genesys_get_address()

See merge request sane-project/backends!399
 2020-04-11 12:38:19 +00:00
Povilas Kanapickas 5ffd4039de genesys: Fix crash when exact usb device is not specified 2020-04-11 15:20:30 +03:00
Povilas Kanapickas 55972a3efa genesys: Fix crash during testing mode 2020-04-11 15:20:29 +03:00
Povilas Kanapickas f48f0bf7d1 genesys: Fix scan area size on OpticFilm 8200i and 7400 2020-04-10 01:14:22 +03:00
Povilas Kanapickas 11cace00a8 Merge branch 'genesys-warmup' into 'master' 
genesys: Fix and enable lamp warmup before first scan

See merge request sane-project/backends!396
 2020-04-09 21:13:27 +00:00
Povilas Kanapickas 33b6052790 Merge branch 'genesys-8600f-ta-position' into 'master' 
genesys: Fix position of transparency area on 8600F

See merge request sane-project/backends!395
 2020-04-09 21:11:29 +00:00
Povilas Kanapickas 5cbb9eaae5 Merge branch 'genesys-cleanup-device-init' into 'master' 
genesys: Cleanup device initialization

See merge request sane-project/backends!394
 2020-04-09 21:09:03 +00:00
Povilas Kanapickas ea94970b6a genesys: Enable lamp warmup on scanners that need it 2020-04-09 23:57:13 +03:00
Povilas Kanapickas f22dd4d7b2 genesys: Move lamp to transparency adapter if needed during lamp warmup 2020-04-09 23:57:12 +03:00
Povilas Kanapickas 21d9079eb7 genesys: Invert meaning of ModelFlag::SKIP_WARMUP 2020-04-09 23:57:11 +03:00
Povilas Kanapickas 8b65356047 genesys: Fix calculation of averages during lamp warmup 2020-04-09 23:57:10 +03:00
Povilas Kanapickas c2480ac064 genesys: Simplify calculation of warmup success criteria 2020-04-09 23:57:09 +03:00
Povilas Kanapickas 40cb193cc3 genesys: Fix debug messages during lamp warmup on 16-bit scans 2020-04-09 23:57:08 +03:00
Povilas Kanapickas 0ab6e78657 genesys: Compare all subsequent scans during lamp warmup 2020-04-09 23:57:07 +03:00
Povilas Kanapickas fa594d965d genesys: Correctly initialize warmup registers in transparency scans 2020-04-09 23:57:06 +03:00
Povilas Kanapickas 6420e00a38 genesys: Don't hardcode depth during warmup 2020-04-09 23:57:05 +03:00
Povilas Kanapickas 4586ae4e56 genesys: Increase consistency of lamp warmup handling 2020-04-09 23:57:04 +03:00
Povilas Kanapickas 15b664fa32 genesys: Fix position of transparency area on 8600F 2020-04-09 23:55:57 +03:00
Povilas Kanapickas 40b4852eb7 genesys: Remove unused argument out of sanei_genesys_asic_init 2020-04-09 23:53:30 +03:00
Povilas Kanapickas 0992b379c8 genesys: Remove unnecessary scan out of gl841 initialization code 2020-04-09 23:53:29 +03:00
Povilas Kanapickas 57b0873a83 genesys: Don't move scanner head forward on startup on gl843 2020-04-09 23:53:28 +03:00
Povilas Kanapickas 0d1542cbe6 genesys: Fix bcdDevice filtering 2020-04-09 23:50:48 +03:00
Povilas Kanapickas bb318cf8f3 genesys: Simplify USB id retrieval 2020-04-09 23:50:47 +03:00
Povilas Kanapickas 13dffa0915 genesys: Defer evaluation of bcdDevice until open() 2020-04-09 23:50:46 +03:00
Povilas Kanapickas 0e8f9c935e genesys: Correctly initialize test USB device 2020-04-09 23:50:45 +03:00
Povilas Kanapickas db50c91132 genesys: Remove uses of sanei_genesys_get_address() 2020-04-05 06:19:38 +03:00
Mario Hros e17646a869 pixma: parse XML response sent by the scanner and present tips to the user 2020-04-04 17:11:31 +02:00
Thierry HUCHARD ba5f992737 Fix all conflicts. 2020-04-04 17:11:16 +02:00
Thierry HUCHARD 4ed0b0fd59 Fix conflicts 2020-04-04 16:29:41 +02:00
Ordissimo fa75c94b24 Merge branch 'master' into 'escl-adf-support' 
# Conflicts:
#   backend/escl/escl.c
#   backend/escl/escl.h
#   backend/escl/escl_capabilities.c
#   backend/escl/escl_crop.c
#   backend/escl/escl_newjob.c
#   backend/escl/escl_scan.c
#   backend/escl/escl_status.c
 2020-04-04 14:04:18 +00:00
Olaf Meeuwissen f8193494ad Merge branch 'newyearsbranch' into 'master' 
canon_lide70-sequel

See merge request sane-project/backends!315
 2020-04-04 04:35:45 +00:00
thierry1970 59824f3d83 Fix style. 2020-04-03 09:37:49 +02:00
thierry1970 8f5f815be1 Moves to the next page for the ADF. 2020-04-03 09:33:55 +02:00
thierry1970 4f8a6991a9 Calculates the cropping offset with the ratio. 2020-04-03 09:23:49 +02:00
thierry1970 dd9e30c814 Adjusts the cropping offset. 2020-04-03 09:22:51 +02:00
thierry1970 7f10387ab0 Calculates the cropping offset with the ratio. 2020-04-02 10:41:59 +02:00
thierry1970 6c0c360ce7 Adjusts the cropping offset. 2020-04-02 10:40:27 +02:00
Povilas Kanapickas 0d5f5b54ed genesys: Enable bcdDevice filtering 2020-04-01 20:57:01 +03:00
Povilas Kanapickas 54f3b8efd1 genesys: Add support for early version of Plustek OpticFilm 7600i 2020-04-01 20:57:00 +03:00
Povilas Kanapickas bfd0b82d2b genesys: Add support for Plustek OpticFilm 8100 2020-04-01 20:56:59 +03:00
Povilas Kanapickas a2a121ab8c genesys: Add support for late version of Plustek OpticFilm 7600i 2020-04-01 20:56:58 +03:00
Povilas Kanapickas ea128674a6 genesys: Add support for early version of Plustek OpticFilm 7400 2020-04-01 20:56:57 +03:00
Povilas Kanapickas 4a1667865a genesys: Add support for Plustek OpticFilm 7200 (v2) 2020-04-01 20:56:56 +03:00
Rolf Bensch 726e3e5407 pixma: backend version 0.27.6 2020-03-31 22:54:30 +02:00
Rolf Bensch 05459de5e8 pixma: print characters @ pixma_hexdump() 2020-03-31 22:54:23 +02:00
Rolf Bensch d2a43afce0 pixma: get device id if we replay a xml file 2020-03-31 20:01:10 +02:00
Rolf Bensch fa9d240e70 pixma: call sanei_usb_exit() on sane_exit() 
see: sane-project/backends#108
 2020-03-31 20:01:10 +02:00
Olaf Meeuwissen 22b548bf22 Merge branch 'escl-fix-capabilities' into 'master' 
escl - fix capabilities

See merge request sane-project/backends!384
 2020-03-30 11:42:02 +00:00
Thierry HUCHARD d06e42b08c Correction of the zone cropping. 2020-03-29 21:42:38 +02:00
Thierry HUCHARD c6a8a54111 Offset correction 2020-03-29 21:42:10 +02:00
Thierry HUCHARD d5fdbb0c7d Revert "Offset correction" 
This reverts commit d7df235a7e.
 2020-03-29 21:37:35 +02:00
Thierry HUCHARD 062fb40cf4 Revert "Correction of the zone cropping." 
This reverts commit 67c7ef9c4e.
 2020-03-29 21:37:25 +02:00
Thierry HUCHARD 67c7ef9c4e Correction of the zone cropping. 2020-03-29 21:35:28 +02:00
Thierry HUCHARD d7df235a7e Offset correction 2020-03-29 21:30:21 +02:00
Thierry HUCHARD 6c855b7662 Fix build. 2020-03-29 16:20:16 +02:00
Thierry HUCHARD b4b1f2c748 Fix build. 2020-03-29 16:12:19 +02:00
Ordissimo 9afdd20776 Fix initialisation variable. 2020-03-29 13:53:42 +00:00
Thierry HUCHARD 3066241e90 Sets the capabilities of the device according to the output format. 2020-03-29 15:47:44 +02:00
Olaf Meeuwissen ee54d3935f Merge branch 'escl-formatext-pdf' into 'master' 
Add FormatExt for PDF.

See merge request sane-project/backends!356
 2020-03-29 12:32:33 +00:00
Povilas Kanapickas 9698bfece7 genesys: Add support for matching devices by bcdDevice 2020-03-28 23:15:48 +02:00
Povilas Kanapickas 0bdce7928f genesys: Turn Genesys_USB_Device_Entry into a class 2020-03-28 23:15:47 +02:00