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

112 Commity (bae938b4be6d74659201a68d40b0977df45de1d9)

Autor SHA1 Wiadomość Data
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
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
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
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
Olaf Meeuwissen dd78511072 Merge branch 'escl-unix-socket' into 'master' 
Add unix socket support to ESCL

See merge request sane-project/backends!348
 2020-03-24 12:22:38 +00:00
Thierry HUCHARD 81325dc773 Fix build. 2020-03-22 16:41:53 +01:00
Thierry HUCHARD f4e6677fc1 Fix build. 2020-03-22 16:29:34 +01:00
Thierry HUCHARD 79f7463366 Refactoring the ADF mode. 2020-03-22 16:14:23 +01:00
Thierry HUCHARD 7caf928797 Correction of the return value of the scanner status 2020-03-17 23:42:53 +01:00
Thierry HUCHARD 136024355d Fix open device. 2020-03-17 11:04:18 +01:00
Thierry HUCHARD 505a2c2208 Fix typo. 2020-03-17 09:51:34 +01:00
Thierry HUCHARD 41541da8ff Fix few arguments to function 'print_xml_s' 2020-03-16 00:37:28 +01:00
Thierry HUCHARD 9315ad2ce6 Fix build. 2020-03-16 00:29:37 +01:00
Thierry HUCHARD f62f9be1dd Fix variable type. 2020-03-16 00:21:49 +01:00
Thierry HUCHARD 682d238c08 Fix build. 2020-03-16 00:13:42 +01:00
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
Thierry HUCHARD cf94e585f5 Full definition of ADF support. 2020-03-15 16:57:14 +01: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
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
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
thierry1970 2739969661 Fix error parsing Location job. 2020-03-06 10:58:31 +01:00
Thierry HUCHARD acfab5b702 renaming the function with a more descriptive name. 2020-03-01 14:54:00 +01:00
Thierry HUCHARD d572db2044 code readability. 2020-03-01 14:48:08 +01:00