Adds a "cancelled" flag to the Avision device structure, cleared
in sane_start() and set in sane_cancel(). Test this flag in
wait_4_light() and bail out of the 90-second "wait for the
light to warm up" loop if the scan is cancelled.
Avision scanners can return an additional light-status value meaning
"Transparent Media Adapter back-light is on". Accept this as
equivalent to "on" during the lamp-warmup check prior to starting a
scan. Re-check the light status after sending the window command, as
the light selection might have been changed and a further warm-up
may be required.
The code which tries aggressively to reset/initialize HP 82xx/83xx
Automatic Document Feeders doesn't work well if there's no ADF attached,
because the scanner reports a non-zero ADF model type in this case.
The retry code makes several attempts to initialize the ADF, and then
bails out with an "Operation not supported" error.
Add a new "option skip-adf" which will cause the backend to believe
the "ADF not present" status if that's what the scanner reports.
Fixes#313751
Jpeg mode (as submitted by Samsung developer) uses temporary file with
fixed name. This opens attacks on reading its content or overwriting any
other user-writable file (with symlink). This change pre-creates
temporary file with O_CREAT|O_EXCL and mode 0600. Assuming usual +t
permissions for tmp this should mitigate issue.
This is purely indent commit without any code changes, in
follow-up to 83bbcfe7d5.
Indent command used:
astyle -A8 -U -H -k3 -W3 -o xerox_mfp-{usb,tcp}.c
Proof that code is not changed:
git log -w -p xerox_mfp-{usb,tcp}.c
- remove ipc_mode option and variables
- set ipc mode based on other options
- cleanup inverted logic DTC options
- fixes threshold option reported in #315069
- ignore result from calibrate(): don't interrupt @ PIXMA_STATUS_BUSY
- MF57x0 devices don't require abort_session() after the last page
- reported by Dmitry Deshevoy
The __sane_unused__ symbol was used slightly more often then UNUSEDARG
and, more importantly, defined in include/sane/sanei_backend.h. That
makes it readily available to virtually all backends.
Unless explicitly asked to do without, all formats for which required
tools are found will be built. Checks cover PostScript, PDF and HTML.
All logic and files involved are now collected in a single "section"
and grouped in such a way that their function should be clearer.
fixup! Refactor API spec conversion support
When libusb-1.0 is not found, libusb-0.1 will be tried. On BeOS and
OS2, nothing should have changed in terms of detection of USB support.
On all systems the --enable-libusb* flags are now ignored. Instead, the
--with-usb and --without-usb flags now control support. When neither is
given USB support will be enable if possible and disabled otherwise. If
--with-usb is requested but not possible, ./configure will fail. There
is no support to prefer libusb-0.1 over libusb-1.0.
Dave Platt