Wykres commitów

11128 Commity (a595875d8748668f4c21eca0e003db148d2bc4f8)

Autor SHA1 Wiadomość Data
Thierry HUCHARD 0440234c36 Fix function proto. 2020-03-16 00:01:58 +01:00
Thierry HUCHARD 54136b8deb If Adf, acquisition of the next page, if it exists. 2020-03-15 23:50:40 +01:00
Povilas Kanapickas a1888ae3bd Merge branch 'genesys-duplication' into 'master'
genesys: Reduce code duplication

See merge request sane-project/backends!357
2020-03-15 16:13:53 +00:00
Thierry HUCHARD cf94e585f5 Full definition of ADF support. 2020-03-15 16:57:14 +01:00
Povilas Kanapickas 3da269b7de genesys: Use common code path for memory layouts 2020-03-14 23:19:38 +02:00
Povilas Kanapickas 718550e2d4 genesys: Add a way to flush GenesysRegisterSettingSet without read back 2020-03-14 23:19:37 +02:00
Povilas Kanapickas cb442169e4 genesys: Implement a way to serialize ModelId 2020-03-14 23:19:36 +02:00
Povilas Kanapickas c1d4369410 genesys: Reuse generic value filtering code for scan method filtering 2020-03-14 23:19:35 +02:00
Povilas Kanapickas c234ce6b77 genesys: Add generic value filter class for resolutions filtering 2020-03-14 23:19:34 +02:00
Povilas Kanapickas ee2e026f2a genesys: Don't overwrite RAM settings 2020-03-14 23:19:33 +02:00
Povilas Kanapickas ea5047466c genesys: Reuse common gpio code on gl846 2020-03-14 23:19:32 +02:00
Povilas Kanapickas 31fecb8140 genesys: Clean up motor setup on gl847 2020-03-14 23:19:31 +02:00
Povilas Kanapickas b307eba5cc genesys: Clean up motor setup on gl846 2020-03-14 23:19:30 +02:00
Povilas Kanapickas 884de5f9fe genesys: Clean up motor setup on gl843 2020-03-14 23:19:29 +02:00
Povilas Kanapickas cd43109966 genesys: Deduplicate gain calibration 2020-03-14 23:19:28 +02:00
Povilas Kanapickas 233cb4bd5a genesys: Use single code path for gain code calculation 2020-03-14 23:19:27 +02:00
Povilas Kanapickas e0bec6723d genesys: Deduplicate offset calibration 2020-03-14 23:19:26 +02:00
Povilas Kanapickas 255da97fcb genesys: Remove get_closest_resolution()
All gl646 scanners have sensors for all supported resolutions
2020-03-14 23:19:25 +02:00
Povilas Kanapickas 428293c1e2 genesys: Reflow sensor tables 2020-03-14 23:19:24 +02:00
Thierry HUCHARD 8ecd54e8d2 Add FormatExt for PDF. 2020-03-14 22:17:34 +01:00
Thierry HUCHARD 22416dece7 Fix style. 2020-03-14 16:42:15 +01:00
Thierry HUCHARD beaba44385 Merge branch 'escl-adf-support' of gitlab.com:sane-project/backends into escl-adf-support 2020-03-14 16:38:40 +01:00
Thierry HUCHARD 749fe19feb Fix build 2020-03-14 16:19:18 +01:00
thierry1970 1b3f0c9bc0 Call explicitly cancel. 2020-03-14 15:43:29 +01:00
Ordissimo 2c12635b23 Remove debug. 2020-03-14 15:42:26 +01:00
Thierry HUCHARD fd0a8a0026 Add support adf. 2020-03-14 15:41:15 +01:00
Rolf Bensch c7c5b1a602 Merge branch '224-enable-avahi-support-by-default' into 'master'
Enable Avahi support by default if possible.  Re #224

Closes #224

See merge request sane-project/backends!355
2020-03-14 13:08:41 +00:00
Rolf Bensch 93fd01866e INSTALL.linux: add missing development package 2020-03-14 13:53:56 +01:00
Olaf Meeuwissen 82515511a6 Merge branch 'master' into '224-enable-avahi-support-by-default'
# Conflicts:
#   .gitlab-ci.yml
2020-03-14 09:03:31 +00:00
Olaf Meeuwissen 168e22a941 Merge branch 'escl-lineart' into 'master'
Escl lineart

See merge request sane-project/backends!339
2020-03-14 09:01:17 +00:00
Ordissimo 5dcd770e5e .gitlab-ci.yml: Revert poppler related changes
The Docker images used by CI have been updated to include the required
packages.
2020-03-14 09:01:17 +00:00
Olaf Meeuwissen 0f857f94cd .gitlab-ci.yml: Follow Avahi configure option rename 2020-03-14 16:02:10 +09:00
Olaf Meeuwissen f8c4bb77de kodakaio: Update Avahi configure time option documentation
It has been removed from the command-line examples as the default is
to enable when possible and the Ubuntu example says to install the
necessary libraries.  The avahi library reference has been fixed.
2020-03-14 15:58:02 +09:00
Olaf Meeuwissen cf7227b598 Pass Avahi related preprocessor flags where needed 2020-03-14 15:48:19 +09:00
Olaf Meeuwissen 53875a5238 Fix WITH_AVAHI preprocessor conditionals
The macro is now always defined to either 0 or 1.
2020-03-14 15:46:03 +09:00
Olaf Meeuwissen f4b7e22bc0 Enable Avahi support by default if possible. Re #224
This eases building of the escl backend and aligns configure time
behaviour with other --with-* options.
2020-03-14 14:59:39 +09:00
Benjamin Gordon 48bc45f46b escl: Add unix socket support
Curl can pass HTTP traffic through a unix socket instead of TCP with the
CURLOPT_UNIX_SOCKET_PATH option.  This is useful if you have a proxy
listening on a local socket between your computer and the scanner.  Now
that URL parsing is centralized, take advantage of this to support an
extended name scheme: escl:unix:/path/to/socket:URL

These names won't be picked up on the network when avahi scans, but they
can be passed manually with -d or added to /etc/sane.d/escl.conf.  If
the existing escl:URL syntax is used, the socket is not set and the curl
option is not used, so existing network connections work the same as
before.

Since local sockets are optional, the current conf parsing scheme
becomes order dependent.  To avoid this, also add an additional "device"
line type to the config parser. If a line starts with "device", the
remainder of the line is treated as a complete device name/URL and
parsed with the URL parsing added in the previous commit.
2020-03-12 13:06:53 -06:00
Benjamin Gordon f6832f2a89 escl: Refactor name handling
Scanners are currently passed around by name, which is actually a URL.
Each function parses the URL a little bit, depending on what it needs,
and then sets the same curl options.

This refactors parsing out into a single escl_parse_name() function
called from sane_open and then passes around the resulting ESCL_Device
instead of the raw name.  To set up the curl handle, the new
escl_curl_url() reconstructs a URL from the parsed ESCL_Device and sets
the appropriate options on the handle.  Each place that makes a curl
call is updated to use the new function.
2020-03-12 11:02:29 -06:00
Rolf Bensch 0033357120 pixma: backend version 0.27.3 2020-03-11 13:21:12 +01:00
Rolf Bensch dd3515ce3f sane-pixma.man: update document date 2020-03-11 13:20:43 +01:00
Rolf Bensch b956a3cef0 pixma: update copyright 2020-03-11 13:19:31 +01:00
Rolf Bensch dbc966e97e Merge branch 'pixma/new_scanners' into 'master'
Pixma: new scanners

See merge request sane-project/backends!354
2020-03-11 12:14:42 +00:00
Rolf Bensch c4af131848 pixma: new scanners Canon PIXMA G7000 and GM4000 Series 2020-03-11 12:56:28 +01:00
Rolf Bensch 7322b5aff0 pixma: restrict ADF scans to 300dpi for Canon i-SENSYS MF440 Series 2020-03-11 12:53:05 +01:00
Rolf Bensch e83c56658e sane-pixma.man: align table of supported scanners 2020-03-11 12:50:32 +01:00
Rolf Bensch b9a19d0cef Merge branch 'patch-1' into 'master'
pixma: detect MF440. Fix #257

Closes #257

See merge request sane-project/backends!347
2020-03-11 11:43:49 +00:00
Rolf Bensch 2b076de25f pixma: new scanner Canon i-SENSYS MF720 Series 2020-03-11 10:27:17 +01:00
pimvantend bd6a2551a5 canon_lide70-common.c
eliminate two spaces near new io_error
2020-03-10 21:00:03 +01:00
pimvantend a0ddf165a7 canon_lide70-common.c
adding empty line
2020-03-10 20:48:10 +01:00
pimvantend 775a26471c canon_lide70-common.c
eliminate u_long
2020-03-10 20:42:31 +01:00