82515511a6
Merge branch 'master' into '224-enable-avahi-support-by-default'
...
# Conflicts:
# .gitlab-ci.yml
2020-03-14 09:03:31 +00:00
168e22a941
Merge branch 'escl-lineart' into 'master'
...
Escl lineart
See merge request sane-project/backends!339
2020-03-14 09:01:17 +00:00
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
0f857f94cd
.gitlab-ci.yml: Follow Avahi configure option rename
2020-03-14 16:02:10 +09:00
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
cf7227b598
Pass Avahi related preprocessor flags where needed
2020-03-14 15:48:19 +09:00
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
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
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
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
0033357120
pixma: backend version 0.27.3
2020-03-11 13:21:12 +01:00
dd3515ce3f
sane-pixma.man: update document date
2020-03-11 13:20:43 +01:00
b956a3cef0
pixma: update copyright
2020-03-11 13:19:31 +01:00
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
c4af131848
pixma: new scanners Canon PIXMA G7000 and GM4000 Series
2020-03-11 12:56:28 +01:00
7322b5aff0
pixma: restrict ADF scans to 300dpi for Canon i-SENSYS MF440 Series
2020-03-11 12:53:05 +01:00
e83c56658e
sane-pixma.man: align table of supported scanners
2020-03-11 12:50:32 +01:00
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
2b076de25f
pixma: new scanner Canon i-SENSYS MF720 Series
2020-03-11 10:27:17 +01:00
70070f7be2
Merge branch '233-additional-sensors' into 'master'
...
Resolve "Regression tests: HP Scanjet 5400C"
See merge request sane-project/backends!351
2020-03-08 17:04:26 +00:00
20419f9815
pixma: detect MF440. Fix #257
2020-03-08 14:33:19 +01:00
9f9536709c
Merge branch '228-remove-sane-desc-timestamping' into 'master'
...
Resolve "Make sane reproducible"
Closes #228
See merge request sane-project/backends!352
2020-03-08 13:11:41 +00:00
10620841b0
Run through all sane-desc modes before signalling failures
2020-03-08 21:56:10 +09:00
ea65e1b2ae
Drop diff ignore pattern from sane-desc check. Re #228
2020-03-08 21:38:45 +09:00
b9651d5e19
Update test reference outputs to match new sane-desc format. Re #228
2020-03-08 21:36:06 +09:00
1f9590ab5a
Remove timestamps from sane-desc output. Re #228
2020-03-08 21:29:29 +09:00
5441ea1c51
hp5400: use standard defines for "color" and "grey" texts
2020-03-07 19:55:52 -08:00
19d033837e
hp5400: fix cancel bug that caused a crash when cancelling a scan or a preview
2020-03-07 15:37:14 -08:00
28bcb9179d
hp5400: added support for editable colour/bw switch and copy count sensors.
2020-03-07 14:36:27 -08:00
090973fa94
Merge branch 'for-upstream/backend_avision_nonfilm_noexposure' into 'master'
...
backend/avision: Disable exposure option for non-filmscanners
See merge request sane-project/backends!23
2020-03-07 09:35:18 +00:00
960394b1e4
Merge branch 'for-upstream/backend_avision_fix_threading' into 'master'
...
backend/avision: fix thread cancellation
See merge request sane-project/backends!21
2020-03-07 09:25:59 +00:00
6fe58ec210
Merge branch '254-remove-sane-standard-documentation' into 'master'
...
Resolve "Remove SANE Standard documentation"
Closes #254
See merge request sane-project/backends!350
2020-03-07 05:14:11 +00:00
67cb40d0f5
NEWS: Document SANE Standard removal
2020-03-07 13:58:27 +09:00
953bea63bb
Merge branch 'escl-fix-parsing-location' into 'master'
...
Fix error parsing Location job.
See merge request sane-project/backends!349
2020-03-07 04:36:08 +00:00
0a5f2f98ff
Merge branch '233-scanimage-mods' into 'master'
...
Resolve "Regression tests: HP Scanjet 5400C" - scanimage
See merge request sane-project/backends!345
2020-03-06 17:19:44 +00:00
2739969661
Fix error parsing Location job.
2020-03-06 10:58:31 +01:00
a34382c67b
hp5400: some small corrections to button descriptions.
2020-03-05 09:19:53 -08:00
180ecf7b41
scanimage: revert previous range change.
...
It is not settled that this change is favourable and is probably out of scope for this issue.
I will leave it for the moment.
2020-03-05 09:18:20 -08:00
dd078cd17d
hp5400: Added support for all buttons.
...
Support to read copy counter display to be done shortly.
2020-03-05 08:58:54 -08:00
11d59a6d75
doc/.gitignore: Remove SANE Standard related files and patterns
2020-03-05 21:20:38 +09:00
599186fdb2
kodakaio: Remove reference to removed --without-api-spec option
2020-03-05 21:18:49 +09:00
d4d5d76e83
Update references to the SANE standard
...
The authors have been added to SANE standard itself, pointers to the
standard now point to the published version and/or the project that
isnow used for its maintenance as appropriate. References to input
files and installation locations have been removed.
2020-03-05 21:14:34 +09:00
4f6b7665a8
hp5400: small enhancement from review to reduce code and increase clarity.
2020-03-03 09:56:39 -08:00
5da64adadf
Merge branch 'escl-load-conf-segfault' into 'master'
...
Reshaping the loading of the device configuration from escl.conf.
See merge request sane-project/backends!340
2020-03-03 10:00:17 +00:00
f24001e46e
pixma: backend version 0.27.2
2020-03-02 16:14:42 +01:00
3c0f8189dd
pixma: fix device define for Canon i-SENSYS MF110/910 Series
2020-03-02 16:13:46 +01:00
2db06a272e
Remove SANE Standard build support
2020-03-02 20:19:07 +09:00
73db94b706
Delete SANE Standard input files from the repository
2020-03-02 20:03:37 +09:00
4948130f7c
scanimage: various small corrections and little changes to enhance clarity.
2020-03-01 23:31:23 -08:00
2868e9e346
hp5400: corrected source for default values.
...
Just correcting a mistake from the previous check in.
Also substituted value variable for clarity.
2020-03-01 23:30:03 -08:00
Olaf Meeuwissen