84c94b8368
handle usb plug/unplug correctly
2023-12-03 07:03:39 +01:00
068714ef6e
fix ifs
2023-12-03 06:14:03 +01:00
f7dd8e224d
memoy leak fix
2023-12-03 06:00:23 +01:00
7631c15c5e
Mem alloc checks, typo and handle cancel scan correctly
2023-12-03 05:51:50 +01:00
80478c865b
add licence & author note
2023-11-30 06:47:40 +01:00
0255c74669
free buffers
2023-11-30 04:53:35 +01:00
65779d6b59
Merge branch 'libxml2-2.12' into 'master'
...
sanei_usb: Fix build with libxml2 2.12
See merge request sane-project/backends!814
2023-11-29 06:40:36 +00:00
ec9efba602
compile/typo fix
2023-11-29 06:39:17 +01:00
0661fe9d89
fix warnings
2023-11-29 06:31:31 +01:00
1fb0a78dd8
simple scan sends cancel on page finish ...
2023-11-29 06:23:32 +01:00
c9e8d812df
reposition readPtr correctly
2023-11-29 06:10:05 +01:00
3f727cfb8f
sanei_usb: Fix build with libxml2 2.12
2023-11-28 21:35:01 +01:00
d022fa9c1b
use buffers
2023-11-27 05:52:00 +01:00
1513839238
whitespace cleanup
2023-11-26 06:43:53 +01:00
fc8e03ef69
cleanup logs
2023-11-26 06:08:37 +01:00
6ee3558990
add color channel swap
2023-11-25 09:23:42 +01:00
768fa3bf59
refactor more readable
2023-11-25 07:18:22 +01:00
94b67794a5
handle high dpi and use a buffer to read data
2023-11-25 06:15:33 +01:00
51aaef6d81
WIP: fill a buffer instead of messy sync read/write
2023-11-24 06:09:27 +01:00
6e9f4b3785
fix debug line
2023-11-23 09:40:54 +01:00
0a0afc2a71
fix typo
2023-11-23 09:13:29 +01:00
5360166729
Merge remote-tracking branch 'origin/lexmark_X2670_backend' into lexmark_X2670_backend
2023-11-23 09:07:22 +01:00
35aed3072c
add debug info
2023-11-23 09:06:12 +01:00
0098b1c58b
Apply 2 suggestion(s) to 1 file(s)
2023-11-23 08:05:14 +00:00
02f1a624f3
Apply 1 suggestion(s) to 1 file(s)
2023-11-23 08:03:57 +00:00
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
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
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
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
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
651fc3419a
pixma: Added speculative definitions for MF750 imageclass machines.
...
Also corrected descrption file entry for TS8700.
2023-11-06 14:48:38 -08:00
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
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
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
43135ab7ed
avision: fix for warning related to pthread unused variable and shadowed variable name.
2023-11-06 10:29:19 -08:00
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
14dbdc759e
pixma: add models October 2023
2023-11-03 10:15:17 +01:00
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
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
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
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
d8c3848765
Fix work with pre-configured device
2023-10-09 20:54:48 +00:00
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
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
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
a617461c63
sanei_config: malformed line can return NULL for token. We should check.
2023-10-02 16:40:27 -07:00
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
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
837d1622ea
epsonds: New model support added.
2023-10-02 20:02:21 +00:00
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
Benoit JUIN