When scanning from ADF in MP150 based scanners, after the last page is
scanned the XML session-close was sent. However, when using the ADF, if
the frontend called sane_start/sane_read(), it would try and send an
XML command that was not valid after the session abort. This would give
an IO error up through the stack.
Now, check if ADF scanning is happening and on reads after the last page
return SANE_STATUS_NO_DOCS on read. and abort.
Finally, minor fix of max DPI for Pixma MAXIFY MB21xx/27xx to 1200 DPI.
The Maxify scanners seem to only be able to return JPEG data for ADF
sources. Attempting to send a gamma LUT will result in an error on
sane_start when trying to use the ADF. Flatbed scanning is unaffected
and runs fine with LUTs like prior models.
This patch adds support to the PIXMA backend for returned JPEG scans
and keys it off of the new capability, ADF_JPEG.
Tested on a Maxify MB2120 using the ADF and the flatbed scanner.
This may also fix other Maxify MB* models where it seems the ADF does
not with with the prior code, but I only have the MB2120 to test.
Not all pthreads implementations use an integer type for pthread_t.
As a matter of fact, POSIX has explicitly withdrawn the requirement
that it must be an arithmatic type.
The musl C library uses a `struct __pthread *` which triggered the
warnings. As of this change, sanei_thread.h works around this by
providing two new macros to help keep this issue out of sight. All
backends have been changed to use these macros.
This gets rid of a number of obsoleted macros and replaces RETSIGTYPE
with a void literal which can be assumed for C89 and later.
This changeset was prepared using autoupdate and modified to get rid of
whitespace and doubled [] changes. Changes to acinclude.m4 were added
by hand.
backend/pixma_sane_options.c backend/pixma_sane_options.h:
- added new options:
original (type of original to be scanned)
target (action to be perfomed as target of the scan)
Both these indocators can be returned by the scanner.
pixma_mp810 can definately return these (e.g. for my MP980)
I have assumed that the same applies to devices in pixma_mp150.c
The target used to be returned in button1/2 in bits 0 - 8.
- All button options are now read and cached when any of the options
are read (SANE_ACTION_GET_VALUE) or SANE_ACTION_SET_VALUE is used
on option button_update.
When reading an option again, the status of all options is re-read.
- Added a dummy info field that is used in case info is NULL
as this is a valid input
add some settings for MF8030, not yet working (different protocol)
modified: backend/pixma.c
modified: backend/pixma.h
modified: backend/pixma_common.c
modified: backend/pixma_imageclass.c
doc/descriptions/pixma.desc
doc/sane-pixma.man
backend/pixma_mp150.c
Updated docs for MX330, supported by the pixma backend.
backend/pixma.h: Bumped pixma backend version added debug message.
backend/pixma.c: added compilation type (w or w/o pthread) debug message.
- backend/pixma.c: fix end of scan buggy exit when compiled with USE_PTHREAD/-lpthread
- backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
change support to complete for MP990 in documentation, as reported by Jean-Michel Pouré.
Rolf Bensch