Wykres commitów

12684 Commity (b31b82c8bd99e890835b0ab8f42cbf118481784e)

Autor SHA1 Wiadomość Data
Benoit JUIN 5360166729 Merge remote-tracking branch 'origin/lexmark_X2670_backend' into lexmark_X2670_backend 2023-11-23 09:07:22 +01:00
Benoit JUIN 35aed3072c add debug info 2023-11-23 09:06:12 +01:00
Ralph Little 0098b1c58b Apply 2 suggestion(s) to 1 file(s) 2023-11-23 08:05:14 +00:00
Ralph Little 02f1a624f3 Apply 1 suggestion(s) to 1 file(s) 2023-11-23 08:03:57 +00:00
Ralph Little 15795b8071 Merge branch '715-have_libsnmp-redefinition' into 'master'
Resolve "HAVE_LIBSNMP redefinition"

Closes #715

See merge request sane-project/backends!812
2023-11-14 17:54:40 +00:00
Ralph Little bb8155804c configure.ac: Fixes to remove #define redefinitions from config.log
Involves a simple rearrange for some clauses to avoid #define
duplication in the config log.
2023-11-14 09:46:11 -08:00
Alex Belkin 0327a5c954 Merge branch 'fix-ci-no-tags' into 'master'
autogen.sh: Reconstruct version from ChangeLog files (for CI)

See merge request sane-project/backends!811
2023-11-08 20:30:00 +00:00
Alex Belkin 02a417721f autogen.sh: Reconstruct version from ChangeLog files (for CI)
When repos are forked on GitLab tags aren't copied (0 Tags) thus making
git-version-gen producing incorrect version ("UNKNOWN") which in turn
causes CI build failures (not helpful for people trying to make Merge
Requests). To workaround this issue reconstruct version from ChangeLogs
files (handy updated on every release). If git describe is not working
and we are not in dist package - take version from the top-most
ChangeLog file.

Example of error messages:

  ../libtool: line 1168: UNKNOWN + : syntax error: operand expected (error token is "+ ")

  In file included from net.c:83:
  net.c: In function 'connect_dev':
  <command-line>: error: 'UNKNOWN' undeclared (first use in this function)
  ../include/sane/sane.h:31:21: note: in definition of macro 'SANE_VERSION_CODE'
     31 |   (  (((SANE_Word) (major) &   0xff) << 24) \
	|                     ^~~~~
  net.c:485:41: note: in expansion of macro 'V_MAJOR'
    485 |   req.version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR,
	|                                         ^~~~~~~
2023-11-07 23:34:24 +03:00
Ralph Little 5bf66ca4e5 Merge branch 'pixma_mf750' into 'master'
pixma: Added speculative definitions for MF750 imageclass machines.

See merge request sane-project/backends!810
2023-11-06 22:56:50 +00:00
Ralph Little 651fc3419a pixma: Added speculative definitions for MF750 imageclass machines.
Also corrected descrption file entry for TS8700.
2023-11-06 14:48:38 -08:00
Alex Belkin 2ba7215acf Merge branch 'fix-alpine-build' into 'master'
CI: Workaround build failures on Alpine

See merge request sane-project/backends!808
2023-11-06 22:00:14 +00:00
Alex Belkin 7a18846c60 CI: Workaround build failures on Alpine
It's confirmed that neither Alpine nor Musl will fix ioctl warnings[1]
that making alpine build to fail and that these warnings are
harmless[2].

  sanei_usb.c:4042:34: error: overflow in conversion from 'long unsigned int' to 'int' changes value from '3221771554' to '-1073195742' [-Werror=overflow]
   4042 |       if (ioctl (devices[dn].fd, SCANNER_IOCTL_CTRLMSG, &c) < 0)
	|                                  ^~~~~~~~~~~~~~~~~~~~~
  cc1: all warnings being treated as errors

Link: https://gitlab.alpinelinux.org/alpine/aports/-/issues/7580
Link: https://www.openwall.com/lists/musl/2020/01/20/3
2023-11-07 00:13:37 +03:00
Ralph Little 5b067b7cda Merge branch 'avision_warning_fix' into 'master'
avision: fix for warning related to pthread unused variable and shadowed variable name.

See merge request sane-project/backends!809
2023-11-06 18:37:43 +00:00
Ralph Little 43135ab7ed avision: fix for warning related to pthread unused variable and shadowed variable name. 2023-11-06 10:29:19 -08:00
Ralph Little 86f41b1360 Merge branch 'pixma-new-model-oct-2023' into 'master'
pixma: add models October 2023

See merge request sane-project/backends!807
2023-11-03 17:48:51 +00:00
Ordissimo 14dbdc759e pixma: add models October 2023 2023-11-03 10:15:17 +01:00
Alex Belkin b38e620c23 Merge branch 'xerox_mfp-no-usb-clear_halt-workaround' into 'master'
xerox_mfp: skip ENDPOINT CLEAR HALT command by default. #706

See merge request sane-project/backends!799
2023-11-03 04:19:53 +03:00
ValdikSS 655b9736c5 xerox_mfp: skip ENDPOINT CLEAR HALT command by default
Some xerox_mfp scanners, such as Samsung SCX-4521F, hangs when
their OUT ENDPOINT receives CLEAR HALT command, which is performed
in usb open and close functions of the backend.
The issue seem to be dependant on USB controller and assumingly
happens due to some sort of incompatibility of USB implementation
in the scanner.

Skip sending this command by default and add
SANE_XEROX_USB_HALT_WORKAROUND env variable to execute
CLEAR HALT commands.
2023-11-02 15:55:55 +03:00
Ralph Little fd22c210cf Merge branch 'master' into 'master'
Correctly set O_NONBLOCK flag and disallow further reception using shutdown on...

See merge request sane-project/backends!803
2023-10-09 23:37:48 +00:00
ThierryFR edc0fd3283 Merge branch 'escl_work_without_zeroconf' into 'master'
Fix work with pre-configured device

Closes #711

See merge request sane-project/backends!804
2023-10-09 20:54:49 +00:00
ThierryFR d8c3848765 Fix work with pre-configured device 2023-10-09 20:54:48 +00:00
Tom Meyer-Mallorie 7df77203ad Correctly set O_NONBLOCK flag and disallow further reception using shutdown on saned data fd once a connection is open. 2023-10-07 22:51:00 +01:00
Ralph Little fd7b83c8f7 Merge branch '708-possible-segv-null-pointer-deref-in-sanei_configure_attach' into 'master'
Resolve "Possible SEGV (null pointer deref) in sanei_configure_attach()"

Closes #708

See merge request sane-project/backends!802
2023-10-02 23:47:59 +00:00
Ralph Little a92ffb3d97 Merge branch '709-possible-segv-heap-bounds-overwrite-in-init_options-test-c' into 'master'
Resolve "Possible SEGV (heap bounds overwrite) in init_options() (test.c)"

Closes #709

See merge request sane-project/backends!801
2023-10-02 23:41:27 +00:00
Ralph Little a617461c63 sanei_config: malformed line can return NULL for token. We should check. 2023-10-02 16:40:27 -07:00
Ralph Little 6fc47c4c14 test: added validation checks for config string option saelections.
This will avoid a reported buffer overflow issue related to invalid (long) options being specified.
2023-10-02 16:23:07 -07:00
Ralph Little ebb8152058 Merge branch 'epsonds_new_models' into 'master'
epsonds: New model support added.

See merge request sane-project/backends!800
2023-10-02 20:02:22 +00:00
Ralph Little 837d1622ea epsonds: New model support added. 2023-10-02 20:02:21 +00:00
Ralph Little 3c20a989cf Merge branch 'xerox-3335' into 'master'
xerox_mfp: add Xerox WorkCentre 3335

See merge request sane-project/backends!790
2023-09-27 14:01:16 +00:00
Ralph Little 41b865e2a5 Merge branch 'master' into 'master'
Correct tpo scan area for agfa arcus 1200

See merge request sane-project/backends!791
2023-09-27 13:58:52 +00:00
Ralph Little b510c87d85 Merge branch 'xerox_mfp-4521f-fixes' into 'master'
xerox_mfp: Add support for Samsung SCX-4521F. #707

See merge request sane-project/backends!797
2023-09-27 13:54:57 +00:00
Marc Schink 3a58649ff1 xerox_mfp: Fix lineart and halftone mode
Halftone and lineart mode do not work properly except for a
resolution of 600 dpi. The very last part of a scanned document is
missing and displayed as black stripe. This problem was found with a
Samsung SCX-4521F, but is assumed to affect other devices, too.

Decode the data received from the device in halftone and lineart mode
to fix this problem.

This patch was tested with a Samsung SCX-4521F device for all
resolutions supported by the device with color, grayscale, lineart
and halftone mode.
No regression test with other devices supported by the xerox_mfp
driver was done because of lack of devices.
2023-09-27 16:32:45 +03:00
Marc Schink 7b0572a180 xerox_mfp: Fix various format specifiers 2023-09-27 16:30:16 +03:00
Marc Schink 1e1f8affb6 xerox_mfp: Add support for Samsung SCX-4521F
The acquisition with the xerox_mfp driver works almost out of the box
for the Samsung SCX-4521F but the process stops just before the end
of the document until an USB transfer timeout expires. The very last
part of the scanned document is missing then.

Do not request more data from the device than available for the last
USB transfer to overcome this problem and to be conform with the
properties of the vendor driver.

The driver was tested for all resolutions supported by the device
with color and grayscale mode.
No regression test with other devices supported by the xerox_mfp
driver was done because of lack of devices.
2023-09-27 16:30:09 +03:00
Ralph Little 2fb8eb90cf Merge branch 'pixma-add-model' into 'master'
pixma:  add 2023 model

See merge request sane-project/backends!795
2023-09-26 15:32:00 +00:00
ThierryFR 3094f4a0dc Merge branch 'canon_pixma-add-model' into 'master'
canon_pixma :  add 2023 models

See merge request sane-project/backends!796
2023-09-26 04:34:45 +00:00
ThierryFR cd5443eec8 canon_pixma : add 2023 models 2023-09-26 04:34:44 +00:00
Ordissimo b1f6bea394 pixma: add 2023 models 2023-09-25 23:18:15 +02:00
Ordissimo 766162cad6 pixma: add 2023 models 2023-09-25 23:13:59 +02:00
ThierryFR 353e089ff4 Merge branch 'scanimage-pdf-error' into 'master'
Fix qpdfview error : Invalid XRef entry 0

See merge request sane-project/backends!794
2023-09-20 18:47:27 +00:00
Ordissimo 5978899b54 Fix qpdfview error : Invalid XRef entry 0 2023-09-20 08:58:49 +02:00
ThierryFR 0c1cbc1b6a Merge branch 'jpeg_fix' into 'master'
escl: Fix crash in libjpeg when cropping the scanned image

See merge request sane-project/backends!793
2023-09-19 19:41:43 +00:00
Sebastian Parborg ba7d24bf30 escl: Fix crash in libjpeg when cropping the scanned image
jpeg_crop_scanline will adjust the x offset and the width of the image
to make it line up with the nearest iMCU boundary.

Before, this was not taken into account and it would make SANE
potentially allocate a too small buffer for the final image.

This would lead to segfaults because libjpeg would try to write outside
of the allocated memory region as it assumes that the buffer was
allocated with the new cinfo.output_width size after cropping.
2023-09-19 15:54:22 +02:00
ThierryFR 9bf2415fe6 Merge branch 'escl-fix-build' into 'master'
escl - Fix #690 use constant build .

See merge request sane-project/backends!792
2023-08-05 16:52:45 +00:00
Ordissimo f9951e3b31 escl - Fix constant build . 2023-08-05 17:55:14 +02:00
Antoni Simka caaf65f1a3
Correct tpo scan area for agfa arcus 1200 2023-07-28 18:21:50 +02:00
Mikhail Novosyolov ba3d80949d xerox_mfp: add Xerox WorkCentre 3335
Works OK, but, when scanning in automatic feeder mode, only the first page is scanned:
e.g. if run
SANE_DEBUG_XEROX_MFP=4 skanlite
skanlite thinks that scanning has been finished after the first page, but the scanner continues to work and debug messages about reading data from the scanner (sane_xerox_mfp_read: <..>) continue to be printed.

Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
2023-07-03 19:20:00 +03:00
m. allan noah 9d721e4610 canon_dr backend v65
- fix imprinter support (#672)
- update attach_one and other init functions
2023-06-06 21:48:56 -04:00
Ralph Little 820ce39e94 Merge branch 'matkoniecz-master-patch-83655' into 'master'
apt install also requires sudo

See merge request sane-project/backends!789
2023-05-08 15:30:38 +00:00
Mateusz Konieczny cfb3ab1bbd apt install also requires sudo 2023-05-08 11:00:00 +00:00