Some parts of SANE used __FUNCTION__ while other parts used __func__.
Now, __func__ is used consistently throughout the SANE sources. This
fixes all occurrences of the following GCC warning:
warning: ISO C does not support '__FUNCTION__' predefined identifier
Various parts of SANE introduced their own compatibility macros for
old compilers that don't support __func__. Most of these definitions
are identical or have minor differences. This patch replaces them
with a single instance in the central header file for backends.
- add pixel_x0 to GT68xx_Params to keep used pixel_x0
- use scan's pixel_x0 and calibration one to compute offset in
calibration data
- use final scan width for per scan calibration
- compute and use offset when copying from calibration data
- add a flag to handle the case of sheetfed scanners that will be
calibrated using a dedicated function that uses an external
calibration sheet
- enable image OPT_QUALITY_CAL for scanners with
GT68XX__FLAG_HAS_CALIBRATE
Calibration and exposure uses a broader spectrum now. Expsoure
limit is increased to 50 loops. Genius Vivid 4x is reported to
work so the UNTESTED label is removed now. Visioneer 7300 is
reported to work so the UNTESTED label is removed now. Genius
ColorPage Vivid 1200XE: Removed UNTESTED label. Fixed
resolutions. Adjusted margins. Fixed color order. Fixed
linedistance. Adjusted AFE. Mustek ScanExpress 1248 UB: Fixed
margins. Adjusted AFE. Adjusted exposure. Adjusted
gamma. Changed status to "complete". Mustek BearPaw 2400 CU
Plus: Adsusted exposure and AFE parameters. Hopefully stripes
and similar trouble are gone now. Mustek BearPaw 1200 CU:
Increased exposure to avoid vertical lines. Updated manual page.
settings. Calibration is not completely ok yet, however. Code cleanup for
setup_scan (only one function for all chipsets). Simplified line mode/pixel
mode setting Updated TODO. Mustek BearPaw 2448 TA Plus is now only "basic". Too
much trouble for "good". Removed option "fast preview". By default for preview
mode 8 bits/pixel are used. Fixed indentation. Full scan really scans from y=0
on gt6816 scanners now.
"unsupported" warning. Added workaround for shared memory compilation problem
on Windows. It's now possible to add a new vendor/product id line to gt68xx.conf
to test yet unsupported scanners without changing the source code.
as that resolution doesn't work. Make sure that the lamp of the Mustek A3 USB
gets warmed up. It's a CIS scanner with a lamp. That code is untested. Full scan
starts scanning from the start position of the white strip now. Added detection
for Genius Vivid 1200 EX. Fixed product id of Mustek BearPaw 2448 TA Plus. Other
minor updates.
U16B. Added Plug-n-Scan 2400 M(T) to list of devices. No positive report yet.
Used request for memory writes and reads instead of a fixed value of 0x04. Set
Genius Vivid4x to GT6816. Untested. All changes have not been tested on their
respective scanners yet. New version: 1.0.50.
control for CCD scanners. Added flag for SE 2400 USB, added some quirks in
gt68xx_gt6801.c. Fixed gt68xx_gt6801 -> lamp control. Adjusted Plustek 1248U
geometry and afe values. CCD gross calibration changed: start with the default
value from module struct. Is faster now for most cases. Only 2.5 mm of
calibration for GT-6801 scanners. Added "afe" option for gt68xx.conf for
selecting default afe values. Removed AFE and exposure SANE options. Added
documentation for afe option in gt68xx.conf. New version: 1.0-35.
table factor option (SANE_CAP_EMULATED). Setup gamma to 2.0 by default. Fixed
(hopefully) sigpipe when cancelling. No geometry quantization anymore (not
necessary). Plustek 1248U: do linemode for every resolution, fix color
correction. Added comments for every Model member in gt68xx_devices. Added
Plustek UT16B and Genius Vivid3x to .desc. Added implementation for inverted
offset for CCD scanners. Added Mustek ScanExpress 2400 USB. Well, at least
it's detected. Added NEW marker to .desc.
gt68xx_low.c. Used DBG instead of XDBG ing gt68xx_low.c. Minor manpage
fixes. Added man page links to other backends. gt68xx_low.h: Fixed
__FUNCTION__ bug on non-gcc compilers. Added more details about the BSDs in
the manpage. Fixed color order for ScanExpress A3 USB.
translation markers for all options. Added German translation for backend
options. Updated manpage and .desc file concerning scanner status. Added
untested flag for Mustek ScanEpress A3 USB and Lexmark X73.
Mikhail Strizhov