Wykres commitów

11760 Commity (e5bd31c88284881f156bbca3d42384711e89a34d)

Autor SHA1 Wiadomość Data
Olaf Meeuwissen e5bd31c882
utsushi.desc: Sync with upstream 2020-11-25 20:05:28 +09:00
Olaf Meeuwissen 8a8595808d Merge branch 'master' into 'master'
Fixed Artec AstraSlim SE configuration.

See merge request sane-project/backends!545
2020-11-23 01:39:29 +00:00
RICCIARDI-Adrien 862ca098ae Fixed Artec AstraSlim SE configuration. 2020-11-21 11:58:17 +01:00
Ordissimo a7f42db900 Merge branch 'add-new-modele' into 'master'
Add model Canon TS-5351

See merge request sane-project/backends!544
2020-11-08 19:31:12 +00:00
Thierry HUCHARD c7dd86c7e7 Add model Canon TS-5351 2020-11-08 20:16:05 +01:00
Thierry HUCHARD eae1e9068a Revert "Add model Canon wqTS-5351."
This reverts commit 9ec62a4780.
2020-11-08 20:11:50 +01:00
Thierry HUCHARD 9ec62a4780 Add model Canon wqTS-5351. 2020-11-08 20:02:55 +01:00
Povilas Kanapickas 7699e1a098 Merge branch 'pixma-calibrate' into 'master'
pixma: Add --calibrate option

See merge request sane-project/backends!542
2020-11-02 22:07:21 +00:00
Iskren Chernev d0695c1470 pixma: Add --calibrate option
Feature was discussed in https://gitlab.com/sane-project/backends/-/issues/321
2020-11-02 22:50:48 +02:00
Olaf Meeuwissen e4ef0548bf Merge branch 'leak_fix' into 'master'
Fix memory leaks in dll and test backends

See merge request sane-project/backends!537
2020-10-20 09:01:15 +00:00
Fletcher Woodruff 6fe222ed29 test: do not leak initial values of string options
The default values for string options are set using static (i.e.
non-malloced) strings. Later, if new values are loaded from the config
file, those SANE_Strings will then point to dynamically allocated memory
which is eventually leaked.

Change the initial values for the string options to NULL, and initialize
them to the proper values within sane_init() using strdup(). This way,
whenever the value for the string is changed, we can safely free() the
previous value.

This eliminates the other main source of memory leaks in the test backend.

This patch also updates sane_init for the test backend to properly cleanup
memory if it fails.
2020-10-19 09:48:49 -06:00
Fletcher Woodruff f71ac6126f test: free memory used for string options
Inside Test_Device, track whether we've already called init_options().
If we have, don't call it again when calling sane_open() again.

Add a function cleanup_options() which frees the memory used for these
options, and call it in sane_exit() if we previously called
init_options().

Change Test_Devices to be initialized with calloc instead of malloc,
so that we can assume that uninitialized fields are NULL, and can safely
call free() on them unconditionally.

This eliminates some larger memory leaks within the test backend.
2020-10-19 09:48:36 -06:00
Ralph Little 016271ebdc Merge branch '362-lexmark-mc3200-mc3224adwe-network-scanner-crash-due-to-null-constraints' into 'master'
Resolve "Lexmark MC3200 / MC3224adwe Network scanner crash due to NULL constraints"

Closes #362

See merge request sane-project/backends!534
2020-10-18 17:36:24 +00:00
Ralph Little bc64c8f549 scanimage: check also for negative word_list length which is nonsensical. 2020-10-18 09:51:35 -07:00
Olaf Meeuwissen 519c300ff0 Merge branch 'brightness_on_12000xl' into 'master'
epson2: fix lower brightness limit for DS-G20000/12000XL

See merge request sane-project/backends!529
2020-10-18 01:47:29 +00:00
Povilas Kanapickas 730982bd6b Merge branch '364-pixma-mx320-cannot-do-1200dpi-in-adf' into 'master'
Resolve "Pixma MX320 cannot do 1200dpi in ADF"

Closes #364

See merge request sane-project/backends!538
2020-10-15 21:20:20 +00:00
Ralph Little 014c307e02 pixma: MX320 machine will not perform 1200 dpi scan from the ADF
600 dpi maximum from ADF.
2020-10-13 09:03:45 -07:00
Fletcher Woodruff de903b84c4 dll: fix memory leak in load
In the case where we are unable to get a path for loading libs, and
instead just use LIBDIR, we set 'src = strdup(LIBDIR)'. However, we
never update orig_src to point to src before tokenizing the path with
strsep(), so the memory is never freed.

Update load to always set orig_src to src so that we don't leak memory.
2020-10-12 16:25:07 -06:00
Gerhard Jäger 7f38f0f71c Merge branch 'canoscan_n650u_plustek_usb_workaround' into 'master'
[plustek] Add 1ms delay before writing to register 0x59 during reseting registers

Closes #137

See merge request sane-project/backends!535
2020-10-12 09:14:04 +00:00
Ralph Little 7e6231fe57 Merge branch '358-gt68xx-1-0-31-breaks-mustek-1248ub-after-first-scan' into 'master'
Resolve "gt68xx: 1.0.31 breaks Mustek 1248UB after first scan"

Closes #358

See merge request sane-project/backends!533
2020-10-10 19:22:41 +00:00
Ralph Little 42520aeaa9 gt68xx: added flag to fix stop scan bug
Some scanners (notably the Mustek 1248UB) doesn't like receiving a
STOP scan command when it is not scanning. Flag prevents it my making
sure that START/STOP commands are only ever paired up.
2020-10-10 12:01:33 -07:00
Ordissimo b75e39af8c Merge branch 'escl-avahi-resolve' into 'master'
Fixes device discovery

See merge request sane-project/backends!536
2020-10-10 16:51:52 +00:00
Thierry HUCHARD 8885312711 Fixes device discovery 2020-10-10 18:01:55 +02:00
Zdenek Dohnal 6af85ec669 plustek-usbhw.c: Add 1ms sleep before writing to register 0x59
Works around discovery problem for CanoScan N650U, fixes #137.
2020-10-09 08:55:41 +02:00
pimvantend 9ac6ee6cd6 desc and news lide 600 2020-10-07 15:06:07 +02:00
Ralph Little 968add6706 scanimage: added checks for null constraints.
We have seen this from buggy backends that present NULL for constraint
string_lists. This is probably illegal behaviour from backends but we
don't want to crash.
2020-10-06 20:16:13 -07:00
Ralph Little 6886cf6e80 gt68xx: Added temporary fix to avoid stop scan during cancel.
Calling this function upsets some scanners in this family.
This temporary sticking plaster permits the Mustek 1248UB scanner to
scan after cancelling. We need to look into this much more when a
scanner becomes available for investigation.
2020-10-03 10:38:50 -07:00
Olaf Meeuwissen 81227d1d40 Merge branch 'avision_add_av186plus_av188_support' into 'master'
add ID information for Avision AV186+ and AV188 sheetfed USB scanners

See merge request sane-project/backends!532
2020-09-29 09:38:15 +00:00
Nikolai Kostrigin 5ef217b19d add ID information for Avision AV186+ and AV188 sheetfed USB scanners
backend/avision.c: add AV186+ as 'good',
                       AV188 as 'untested'
doc/descriptions/avision.desc: add AV186+ as 'good',
                                   AV188 as 'untested'
2020-09-28 18:31:56 +03:00
Olaf Meeuwissen efd4767d13 Merge branch 'epson2/rework_focus' into 'master'
Epson2/rework focus

See merge request sane-project/backends!531
2020-09-28 09:16:31 +00:00
Olaf Meeuwissen 9e9dc5104e Merge branch 'esci_set_focus_retval' into 'master'
epson2: check for return value of e2_esc_cmd

See merge request sane-project/backends!526
2020-09-27 08:01:36 +00:00
Wolfram Sang 7139d6decf epson2: add autofocus
Enable autofocus support on my Epson 12000XL. The middle of the scan
area will be used as the focus point. An arbitrary X,Y is possible but
not implemented yet

Signed-off-by: Wolfram Sang <wsa@kernel.org>
2020-09-26 17:14:47 +02:00
Wolfram Sang 5d706c2c35 epson2: implement full range manual focus settings
Allow the whole range of manual focus settings as an expert option. This
is also now independent of a TPU being installed or not. The old default
values are applied if the user changes the source type (either FLATBED
or TPU). Adding a focus group here because autofocus options will come
with later patches.

Signed-off-by: Wolfram Sang <wsa@kernel.org>
2020-09-26 16:48:51 +02:00
Wolfram Sang f9f75ca068 saneopts: add entries for focus/autofocus
coolscan2 has focus entries already reused in coolscan3. Because I want
to add the same options to epson2, it makes sense to make them available
globally. Add i18n while here.

Signed-off-by: Wolfram Sang <wsa@kernel.org>
2020-09-26 16:48:51 +02:00
Wolfram Sang a0e68f7de9 epson2: enable focus for all scanner types
Even with USB based scanners, we need to send the esci command to set
the focus. There is no byte in the extended scanning parameters for it.
So, move the code to a place where it is called for all cases.

Signed-off-by: Wolfram Sang <wsa@kernel.org>
2020-09-26 11:48:10 +02:00
Wolfram Sang 1653b0f80c Merge branch 'zdohnal/esci_set_focus_retval' into focus_on_12000XL 2020-09-26 11:47:57 +02:00
Rolf Bensch 429cc0efc0 pixma: backend version 0.28.6 2020-09-25 16:40:07 +02:00
Rolf Bensch 9db8fc305e pixma: add comment for last merge 2020-09-25 16:38:38 +02:00
Rolf Bensch e80612275e Merge branch 'patch-1' into 'master'
Added support for Canon Pixma MX340 buttons and ADF status

See merge request sane-project/backends!513
2020-09-25 14:35:40 +00:00
Rolf Bensch 72fd68cb56 introduce Povilas Kanapickas as pixma maintainer 2020-09-25 16:20:58 +02:00
m. allan noah e46adab4f2 canon_dr v59: fine calibration updates
- restructure fine calibration code
- initial support for uploading fine calibration payloads
- improve DR-C225 support

Most canon scanners require that the driver apply fine (per-cell)
calibration information. But a few require that the info be loaded
into the scanner. Here, we add initial support for that, though the
needed values are hardcoded instead of calculated.
2020-09-23 21:43:35 -04:00
m. allan noah 588f01526e fujitsu v137b: brightness/contrast improvements
- change window_gamma init (fixes bright/contrast for iX1500)
- only call send_lut after set_window (remove late_lut)
2020-09-23 21:42:44 -04:00
m. allan noah 5b92a367c3 fujitsu v137a: fix JPEG duplex memory corruption 2020-09-23 21:39:14 -04:00
Zdenek Dohnal 94506b1787 epson2: check for return value of e2_esc_cmd 2020-09-22 11:34:56 +02:00
Wolfram Sang b1b412d5f8 epson2: fix lower brightness limit for DS-G20000/12000XL
I get -EINVAL with -4 (ROM Version 1.02). -3 works.

Signed-off-by: Wolfram Sang <wsa@kernel.org>
2020-09-18 20:37:40 +02:00
Ordissimo 6d7fbc8320 Merge branch 'escl-check-scan-options' into 'master'
Check options scan and fix xml.

See merge request sane-project/backends!528
2020-09-18 14:03:22 +00:00
thierry1970 cd768b3692 Check options scan and fix xml. 2020-09-18 15:47:45 +02:00
Ordissimo b155955b0e Merge branch 'escl-add-scan-options' into 'master'
Added options: Brightness, Threshold, Sharpen and Contrast.

See merge request sane-project/backends!527
2020-09-17 20:29:28 +00:00
thierry1970 e281dfb0cd Fix style. 2020-09-17 18:55:03 +02:00
thierry1970 fcbeeccbf0 Added options: Brightness, Threshold, Sharpen and Contrast. 2020-09-17 18:50:33 +02:00