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

78 Commity (1bd4fc283a08117bceb51e6613831fa6d4412dfd)

Autor SHA1 Wiadomość Data
thierry1970 1027e8aae0 Fix build. 2020-05-14 15:31:10 +02:00
thierry1970 bd8cb0e6aa Code cleanup. 2020-05-14 14:03:20 +02:00
thierry1970 287a6bb88a Test status device before scan and after. 2020-05-14 13:05:08 +02:00
Thierry HUCHARD d9c377cf09 Fix style 2020-05-13 22:24:51 +02:00
Thierry HUCHARD c66efc0faf Allows the X and Y offset to be set to 0. 2020-05-13 22:20:55 +02:00
Thierry HUCHARD 29866b0b19 Fix status sane_read. 2020-05-13 20:33:01 +02:00
Thierry HUCHARD dc2b9aeade JobState, if it exists, decides whether to proceed to the next page. 2020-05-10 22:20:30 +02:00
Thierry HUCHARD 70daed5132 Fix error name variable. 2020-05-10 15:11:30 +02:00
Thierry HUCHARD 64c1c8a865 Logic correction. 2020-05-10 01:28:49 +02:00
thierry1970 a931e0df57 Refactoring of the adf status. 2020-05-07 19:19:55 +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
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
Thierry HUCHARD 8e2d335653 Put the vendor corresponding to the device used. 2020-05-05 22:29:03 +02: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
Thierry HUCHARD 2190739b31 Fixed source argument. 2020-05-01 11:59:58 +02:00
thierry1970 32083172ea Allows you to move to the next page. 2020-04-21 14:49:40 +02: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
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 8f5f815be1 Moves to the next page for the ADF. 2020-04-03 09:33:55 +02:00
thierry1970 dd9e30c814 Adjusts the cropping offset. 2020-04-03 09:22:51 +02:00
thierry1970 6c0c360ce7 Adjusts the cropping offset. 2020-04-02 10:40:27 +02:00
Thierry HUCHARD c6a8a54111 Offset correction 2020-03-29 21:42:10 +02: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 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 9315ad2ce6 Fix build. 2020-03-16 00:29:37 +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 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
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
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
Thierry HUCHARD 5503bf8e67 Fix the 0x0 geometry problem. 2020-02-21 22:50:23 +01:00
thierry1970 c23cc87e52 Reshaping the loading of the device configuration from escl.conf. 2020-02-20 09:25:42 +01:00
Olaf Meeuwissen 36f068a0ce Merge branch 'escl-page-crop' into 'master' 
Escl page crop

Closes #230

See merge request sane-project/backends!316
 2020-02-11 07:38:28 +00:00