Wykres commitów

12505 Commity (9ce70f06c844a11616044f9cf0b43316d3aa7ccc)

Autor SHA1 Wiadomość Data
Ralph Little cc0d729e1f Merge branch 'pixma-add-TS3400' into 'master'
pixma:Add TS3400.

See merge request sane-project/backends!704
2022-04-21 04:40:26 +00:00
Ralph Little 71152f0171 Merge branch 'make-silent-rules-output' into 'master'
Utilize Automake macros for silent rules output

See merge request sane-project/backends!718
2022-04-21 01:23:44 +00:00
Ralph Little 33f0751670 Merge branch 'ci-bump-versions' into 'master'
CI: Bump all distributions to stable versions

See merge request sane-project/backends!705
2022-04-21 01:22:50 +00:00
Ralph Little f1e3a41037 Merge branch 'mustek-usb2-status' into 'master'
mustek_usb2: Replace STATUS type with SANE_Status

See merge request sane-project/backends!720
2022-04-21 01:22:09 +00:00
Ordissimo f71b32c632 Merge branch 'escl-pdf-mmap' into 'master'
escl: convert get_PDF_data() to use GMappedFile and GBytes

See merge request sane-project/backends!719
2022-04-19 12:11:24 +00:00
David Ward b2c2b74858 escl: convert get_PDF_data() to use GMappedFile and GBytes 2022-04-19 12:11:24 +00:00
David Ward 03bfd4232c Makefile: Utilize Automake macros for silent rules output
Building with --enable-silent-rules makes it easier to identify errors
or warnings in the build output. Automake provides macros for custom
rules to use, so that they will print a similar message to rules which
run the compiler or linker:

...
  CC       libpieusb_la-pieusb.lo
  CCLD     libpieusb.la
  CCLD     libsane-pieusb.la
  CC       libsane_pixma_la-pixma-s.lo
  GEN      pixma/pixma_sane_options.h
  GEN      pixma/pixma_sane_options.c
  CC       pixma/libpixma_la-pixma.lo
...

This does not change the current output if silent rules are disabled.
2022-04-17 20:16:19 -04:00
David Ward 939d62f836 backend/Makefile: Remove unneeded references to $(srcdir)
Adjust these rules to use relative pathnames, like the other rules.
2022-04-17 20:14:15 -04:00
Ralph Little 602b4f8d3d genesys: add full button support for the Canon 5600F
This model spreads their GPIO buttons lines over 3 different registers:
0x6c, 0xa6 and 0x6d
2022-04-15 11:50:56 -07:00
David Ward db25c1e7eb doc/saned: Improve security warnings
The current warnings do not explain to the administrator what risks may
actually be involved by exposing saned to the network, so that they can
take the appropriate measures.

Currently the administrator is advised to restrict incoming connections
to saned (using tcpwrappers and/or firewall rules). This might not have
been the typical posture when this was written. More importantly, these
actions are not meant to protect against a loss of confidentiality, and
the administrator should not be led to believe this is the case.

Suggest the use of a secure tunnel between each client and saned, which
can be achieved without modifying the software.
2022-04-14 19:45:56 -04:00
David Ward db009d158e doc/saned: Move service configuration details out of man page
The saned(8) man page should be used to describe the behavior of saned
itself. The information about configuring inetd, xinetd, or systemd to
launch saned - while it is helpful - belongs in a separate location.
Keep in mind that distribution packages usually configure the service
automatically, and they may ship with their own specific instructions.
(For example, update-inetd can be used in Debian and its derivatives.)

This change moves this information from the man page into a new file,
making it more concise as well. Working examples are moved to separate
files that can be copied directly from the source tree to the system.
2022-04-14 19:14:50 -04:00
Aaron Jackson a1fbbae636 Update fujitsu description to include SP30 as good 2022-04-14 22:25:29 +01:00
Aaron Jackson 140100bb23 Fujitsu / PFU SP30
Tested and working against the Fujitsu driver.
2022-04-14 22:13:20 +01:00
Ordissimo 785a935e9e Merge branch 'FixEsclTiffSupport' into 'master'
Fix inversed logic in escl_tiff.c:get_TIFF_data

See merge request sane-project/backends!715
2022-04-14 13:50:58 +00:00
Raphael Isemann 877871443d Fix inversed logic in escl_tiff.c:get_TIFF_data
malloc returns NULL on error, but this code errors out on the non-NULL pointer
indicating success (which essentially makes this function always fail).

Signed-off-by: Raphael Isemann <teemperor@gmail.com>
2022-04-14 08:29:43 +02:00
Ralph Little ea8d0eb91e Merge branch 'genesys_8400f_sensors' into 'master'
Genesys 8400f sensors

See merge request sane-project/backends!712
2022-04-13 18:24:57 +00:00
Ralph Little b3a04eae1a genesys: added special PDF function definitions for Canon 4400f 2022-04-13 11:07:45 -07:00
Ralph Little 54766358b5 genesys: corrections for 4400f buttons.
Additional special PDF buttons not yet included.
We need a strategy to deal with them.
2022-04-13 11:06:02 -07:00
Ordissimo 804e936a65 Merge branch 'escl-fix-type-ip' into 'master'
escl: Fix ipv6 detection.

See merge request sane-project/backends!714
2022-04-09 15:49:47 +00:00
Ordissimo b5d5b01886 escl: Fix ipv6 detection. 2022-04-09 17:31:36 +02:00
David Ward 172e161369 configure: Remove --with-group option for device locking
This option is not used anywhere in the code or the build system, except
that ./configure will not build device locking support if this is set to
a non-existent group. (It chooses uucp by default.)

However, that check does not actually work. It attempts to run the chgrp
command on a temporary file; but since ./configure is run without root
privileges, that always fails unless the user running ./configure is a
member of the group.

Remove both the option and the broken check. It is assumed that device
locking support was typically disabled in builds because of this issue,
and it will now be restored except where --disable-locking is specified.
2022-04-06 23:56:29 -04:00
Ralph Little ab7b3a38e2 genesys: added button definitions for Canoscan 8400F. 2022-04-03 14:47:51 -07:00
Ralph Little 586ff11af5 Merge branch 'pixma-sa-size' into 'master'
pixma: fix broadcast_sa size calculation

Closes #426

See merge request sane-project/backends!572
2022-03-29 05:45:03 +00:00
David Ward b458cb14c6 CI: Continue using Debian 10 to build docs and run "make distcheck"
While outstanding issues that cause compiler warnings are being fixed,
continue using Debian 10 (oldstable) rather than Debian 11 (stable) to
build HTML documentation and run "make distcheck".
2022-03-27 19:57:08 -04:00
Ralph Little 49dfefe8c0 Merge branch 'portable-filenames' into 'master'
Rename doc/*/template.desc. for Windows compatibility

See merge request sane-project/backends!711
2022-03-27 22:44:16 +00:00
David Ward 732fc8cad7 Rename doc/*/template.desc. for Windows compatibility
Windows does not allow filenames ending in a period ("."), preventing
this git repository from even being checked out on a Windows system.

Drop the trailing period in these two filenames. Both files will still
be skipped during the build, since they are not included in DESC_FILES
or DESC_EXT_FILES in doc/Makefile.am.
2022-03-27 17:11:56 -04:00
David Ward 8bbcdf8de3 avision: Invert conditional for software scaling
Place the alternative calls to fwrite() near each other in the code,
for better readability.
2022-03-27 16:51:30 -04:00
David Ward c7a33643f3 avision: Fix line numbers in debug message for software scaling
Print line numbers that are relative to the entire output, rather than
the current stripe.
2022-03-27 16:51:30 -04:00
David Ward 1277612c5b avision: Cancel scanning before closing device 2022-03-27 16:51:30 -04:00
David Ward bd6ad2e092 avision: Correctly handle failure to open file 2022-03-27 16:51:30 -04:00
Ralph Little c1c77436f4 Merge branch '578-remove-linux-kernel-driver-for-plustek_pp-backend' into 'master'
Resolve "Remove Linux kernel driver for plustek_pp backend"

Closes #578

See merge request sane-project/backends!708
2022-03-25 03:49:57 +00:00
Ralph Little 3513af029e plustek-pp: Removed module build files from dist make rules. 2022-03-23 13:26:53 -07:00
Ralph Little 27a7c4518e plustek-pp: removed conditionally compiled code for Linux driver.
Mainly consists of removing code for #ifdef __KERNEL__
In order to keep it really clear what code has been removed, I have
not corrected any formatting issues.
2022-03-23 13:15:27 -07:00
Povilas Kanapickas e87bd848df Merge branch 'merge-release-1.1.x' into 'master'
Merge release-1.1.x branch to master.

See merge request sane-project/backends!709
2022-03-21 20:41:50 +00:00
Povilas Kanapickas aba8c30c92 Merge branch 'release-1.1.x' into merge-release-1.1.x 2022-03-21 22:26:33 +02:00
David Ward 60209994a1 CI: Temporarily allow build job failures
Specify -Werror in both CFLAGS and CXXFLAGS for all build jobs.

For the updated build targets, temporarily allow the build job to fail
while outstanding issues that cause compiler warnings are being fixed.
2022-03-19 19:10:40 -04:00
David Ward 6a14383e84 CI: Bump all distributions to stable versions
Use Alpine 3.15.0; Debian 10.11 and 11.2; Fedora 35; and Ubuntu 20.04.
2022-03-19 19:06:18 -04:00
Ralph Little 6054620c69 Merge branch '583-samsung-scx-4824fn-support' into 'master'
Resolve "Samsung SCX-4824FN Support"

Closes #583

See merge request sane-project/backends!707
2022-03-19 16:20:34 +00:00
Ralph Little ad08e768be Merge branch 'resolve-compiler-warnings' into 'master'
Resolve compiler warnings (including fixes for actual bugs)

See merge request sane-project/backends!701
2022-03-19 16:19:54 +00:00
Ralph Little 3635176eb9 plustek_pp: Removed references to the kernel driver from doc. 2022-03-15 18:57:51 -07:00
Ralph Little 2cf41870b9 xerox_mfp: added fix for Samsung SCX-4824FN and friends for broken JPEg support 2022-03-14 16:35:19 -07:00
Ralph Little 95e2498fe9 Merge branch 'canon_pp-weights-file' into 'master'
canon_pp: Avoid buffer overflow if pathname exceeds PATH_MAX

See merge request sane-project/backends!702
2022-03-14 00:25:02 +00:00
Ralph Little 7cdd2ad268 Merge branch '580-canoscan-lide-220-aborts-before-end-of-4800dpi-colour-scan' into 'master'
Resolve "Canoscan LiDE 220 aborts before end of 4800dpi colour scan"

Closes #580

See merge request sane-project/backends!697
2022-03-10 01:31:01 +00:00
Ralph Little 2d49a2af65 Merge branch 'pixma-fix-max-resolution' into 'master'
pixma:Fix max resolution

See merge request sane-project/backends!703
2022-03-10 01:29:59 +00:00
Ordissimo e5ff5d06e5 pixma:Fix max resolution 2022-03-10 01:29:59 +00:00
thierry1970 356f1c9b27 pixma:Add TS3400. 2022-03-09 09:02:41 +01:00
Ralph Little 84e907f87c Merge branch 'resolve-sane-desc-warnings' into 'master'
descriptions: Resolve multiple warnings from sane-desc

See merge request sane-project/backends!698
2022-03-09 03:51:08 +00:00
David Ward ff4114a795 kvs40xx: Return NULL from read_data()
Functions called by pthread_create() have the return type (void *).
However, the return statements in read_data() use a value of type
SANE_Status rather than a pointer, which causes a compiler warning.

This return value is never actually used, so return NULL instead.
2022-03-08 19:00:00 -05:00
David Ward 9cd0b1809c lexmark_low: Adjust calculation of bytes available in read buffer
GCC warns that an unsigned value is passed to abs(), which may not be
intended. To resolve this warning, adjust the code so abs() is not used
and the behavior is more explicit.
2022-03-08 19:00:00 -05:00
David Ward 0c70fd560c canon_pp: Avoid buffer overflow if pathname exceeds PATH_MAX
If the weights file pathname is longer than PATH_MAX, it may be written
past the end of the buffer on the stack; or it may be truncated when it
is written to allocated memory (such that it is not null-terminated).

Adjust the code to fix both issues. Dynamically allocate memory for the
actual length of the pathname so that it is not constrained by PATH_MAX.
2022-03-08 19:00:00 -05:00