Wykres commitów

11794 Commity (ee7f913974efb0e08fc1456f0096ff49e3b155b4)

Autor SHA1 Wiadomość Data
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
Olaf Meeuwissen ddcfa6a12f Merge branch 'master' into 'master'
Do not use fixed python executable name and use AM_PROG_PYTHON

See merge request sane-project/backends!525
2020-09-17 11:41:31 +00:00
Your Name 924dcf0731 Lower minimum python version required to 2.7 2020-09-14 15:44:36 +01:00
Your Name 0f7ce3fe7a Do not use fixed python executable name and use AM_PROG_PYTHON
On many systems now python executable it is python3.
On my system it the case and by this muild failed with:

make[2]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/backends-1.0.31/backend'
make[2]: Entering directory '/home/tkloczko/rpmbuild/BUILD/backends-1.0.31/backend'
Generating pixma/pixma_sane_options.h from pixma/pixma.c
/bin/sh: python: command not found
make[2]: *** [Makefile:7317: pixma/pixma_sane_options.h] Error 127
make[2]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/backends-1.0.31/backend'
make[2]: *** Waiting for unfinished jobs....

Using AM_PROG_PYTHON() nmacro cllows avoide tha by hecks current version of the
python and allw to use custom python executable by execute configure by:

$ PYTHON=</some/python> ./configure <params>

AM_PROG_PYTHON aclocal macro propagates to automake files $(PYTHON) variable
which could be used on geberate instaleable scripts on duting build process like
it is now in backend/Makefile.am.

Currently minum version of required vesion of the python is python >= 3.
2020-09-13 20:17:43 +01:00
Olaf Meeuwissen b89b9b1350 Merge branch '345-fix-pixma-libxml-build-dependency' into 'master'
pixma: Restore old behaviour in case XML support is missing

Closes #345

See merge request sane-project/backends!524
2020-09-13 10:38:24 +00:00
Olaf Meeuwissen a380fb0894
pixma: Restore old behaviour in case XML support is missing
Fixes #345.
2020-09-13 18:47:32 +09:00
Olaf Meeuwissen 2c5f3e1814 Merge branch '344-generate-sane-backends-pot-inputs' into 'master'
po: Make sure all sane-backends.pot input are available

Closes #344

See merge request sane-project/backends!523
2020-09-13 09:12:58 +00:00
Olaf Meeuwissen 4846d36ad1
po: Make sure all sane-backends.pot input are available 2020-09-13 17:56:40 +09:00
Olaf Meeuwissen 3ac8ca4e87 Merge branch 'epson_perfection_1640' into 'master'
Add SCSI ids for Epson Perfection 1640SU

See merge request sane-project/backends!509
2020-09-13 08:44:21 +00:00
Olaf Meeuwissen e69284695a Merge branch '350-remove-automake-maintainer-mode' into 'master'
Resolve "1.0.31: build fails"

Closes #350

See merge request sane-project/backends!522
2020-09-13 08:38:26 +00:00
Olaf Meeuwissen 0077988e83
po/README: Make the documentation use consistent notation 2020-09-13 16:34:05 +09:00
Olaf Meeuwissen e22b393e38
po/README: Update documentation that refers to maintainer mode 2020-09-13 16:34:05 +09:00
Olaf Meeuwissen 262e32ce59
configure.ac: Remove maintainer mode
Now that we no longer include generated files in our git repository
builds should always have maintainer mode enabled so checkouts pick
up on changes in Makefile.am, configure.ac, etc. between builds.

See #350.
2020-09-13 16:34:05 +09:00
Olaf Meeuwissen 30b7e31eac
configure.ac: Remove stale release versioning comment 2020-09-13 16:34:05 +09:00
Olaf Meeuwissen 2539a13dfb
Fix spelling differences in testsuite reference data
Fix up of ffff088641.
2020-09-13 16:31:41 +09:00
Olaf Meeuwissen 404e1500c2 Merge branch 'usb_udev_attrs' into 'master'
Speedup ATTR match for USB devices

Closes #341

See merge request sane-project/backends!510
2020-09-13 06:07:39 +00:00
Olaf Meeuwissen b5cf71318b
sane-desc: Update test reference files
This follows ad66f79c43.
2020-09-13 14:50:15 +09:00