openharmony/third_party_backends
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_backends.git synced 2026-07-01 09:11:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

.editorconfig: trim trailing whitespace

Browse Source
This commit is contained in:
Olaf Meeuwissen
2017-05-27 14:27:22 +09:00
parent b748781571
commit 9faf64b6c8
570 changed files with 12036 additions and 12033 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.editorconfig
+3
View File
@@ -7,3 +7,6 @@
# See http://editorconfig.org/#download for details.
root = true ; look no further
[*]
trim_trailing_whitespace = true
AUTHORS
+1 -1
View File
@@ -85,7 +85,7 @@ Backends:
pnm: Andreas Beck, Gordon Matzigkeit, David Mosberger, Michael
Herder, and Henning Geinitz
qcam: Scott Laird (original driver), David Mosberger (SANE backend),
despeckling filter by Patrick Reynolds,
despeckling filter by Patrick Reynolds,
B&W fixes by Andrew Kuchling
ricoh: Feico W. Dillema
rts8891: Stéphane Voltz
ChangeLogs/ChangeLog-1.0.0
+22 -22
View File
@@ -3,7 +3,7 @@
* Version 1.0 released
* From Brian J. Murrell:
* backend/dll.conf: Mention dc210.
* backend/cderror.h: New file.
@@ -359,7 +359,7 @@
models.
* backend/epson.c: Apply Christian Bucher's patch.
* backend/dc25.h: New file (by Peter Fales <psfales@earthling.net>)
* backend/dc25.c: Ditto.
* backend/dc25.conf: Ditto.
@@ -381,7 +381,7 @@
* backend/artec.c: Added code to default to using millimeters
instead of pixels for measurements, can revert to pixels by
defining PREFER_PIXEL_MODE at compilation time.
Added code to cause sane_read to block until data available to return,
also buffers as much data as possible before returning.
@@ -690,7 +690,7 @@
needs to be installed before running configure.
* backend/s9036.c: Don't depend on GNU C dynamically sized arrays.
* backend/coolscan.c (send_one_LUT): Use alloca() instead of
depending on GNU C dynamically sized arrays.
Include <alloca.h>.
@@ -715,7 +715,7 @@
* sanei/sanei_pio.c: Ditto.
* backend/epson.c, backend/epson.h, backend/epson.conf: Updated
with Christian's version adds support for parallel port interface.
* sanei/sanei_scsi.c (sanei_scsi_req_wait): Patch by Matto to let
sense-handler decide whether a non-zero sense_buffer[0] really
should be considered an error (needed for Microtek backend).
@@ -724,7 +724,7 @@
unit SANE_UNIT_MICROSECOND.
Patches by Oliver Rauch:
* frontend/gtkglue.c (unit_string): Handle SANE_UNIT_MICROSECOND.
* frontend/scanimage.c (print_unit): Ditto.
(parse_scalar): Ditto.
@@ -752,7 +752,7 @@
* backend/snapscan.c (DL_INFO): Increase from 0 to 1.
(DL_MAJOR_ERROR): Ditto. This avoids printing error messages
unless the user specifically requests them.
* frontend/gtkglue.c: Include <sys/types.h>.
* include/sane/config.h.in: Ignore HAVE_USLEEP under Apollo
@@ -792,7 +792,7 @@
* backend/epson.conf: New file.
Patches by Yuri Dario <mc6530@mclink.it>:
* backend/epson.c (sane_init): Support config file.
* sanei/sanei_ab306.c (outb): Add missing parens.
@@ -841,7 +841,7 @@
* backend/snapscan.c: Upgrade to latest version (0.3 patch 7).
* backend/snapscan.h: Ditto.
* configure.in (V_MINOR): Up version to 0.71.
* sanei/sanei_scsi.c (scsi_cmd) [USE == SOLARIS_INTERFACE]: "or"
@@ -918,7 +918,7 @@
* tools/xerox (scale): Added improvements contributed by Joachim
Woll <woll@physik.uni-kassel.de>.
* Upgrade to Oliver's latest UMAX backend.
* Upgrade to Oliver's latest UMAX backend.
* include/Makefile.in (distclean): Add empty all rule. Add
distclean rule to delete Makefile.
@@ -1026,7 +1026,7 @@
* backend/mustek.c (dev_open): Fix debug message.
* Solaris related patches by Martin Huber:
* backend/umax-scsi.c (umax_wait_scanner): Sleep for 1 second
instead of 100ms on Sun platforms---the SCHILYscg driver prints a
warning message each time a device is busy. Duh.
@@ -1145,7 +1145,7 @@
* Several changes in tools/find-scanner.c to run using
above mentioned driver.
Fixed wrong IN_periph_devtype_cpu (was 1, should be 3).
Fixed wrong IN_periph_devtype_cpu (was 1, should be 3).
1997-12-14 David Mosberger-Tang <David.Mosberger@acm.org>
@@ -1263,11 +1263,11 @@
* japi/SaneOption.java: Fix indentation.
(unitString): New function.
* japi/ImageCanvas.java: New file.
* japi/Jscanimage.java: Ditto.
* japi/ScanIt.java: Ditto.
* japi/Makefile.in (CLASSES): Mention ScanIt.class and
ImageCanvas.class.
(all): Mention Jscanimage.class.
@@ -1332,7 +1332,7 @@
correct value before connecting the toggled callback.
Bugs reported by Petter Reinholdtsen <pere@link.no>:
* sanei/sanei_config.c (sanei_config_open): Add missing cast to
(char *).
@@ -1364,7 +1364,7 @@
* backend/hp.c (sane_control_option): Only turn on RELOAD_PARAMS
when value changed.
* backend/qcam.c (sane_control_option): Only turn on
RELOAD_PARAMS when value changed.
@@ -1578,7 +1578,7 @@
* configure.in (CPPFLAGS): Ditto.
* include/sane/config.h.in: Ditto.
* backend/epson.c: Updated
* backend/epson.c: Updated
1997-10-09 David Mosberger-Tang <David.Mosberger@acm.org>
@@ -1704,7 +1704,7 @@ Tue Oct 7 15:44:33 1997 Kazuhiro Sasayama <kaz@hypercore.co.jp>
* backend/microtek.c: Updated with latest version from
http://www.mir.com/mtek/ by Matt Marjanovic <maddog@mir.com>.
* backend/microtek.h: Ditto.
1997-10-3 Jeff Freedman <jsf@hevanet.com>
* sanei/sanei_scsi.c: Minor fixes for OS/2 support.
@@ -1722,7 +1722,7 @@ Tue Oct 7 15:44:33 1997 Kazuhiro Sasayama <kaz@hypercore.co.jp>
[USE = OS2_INTERFACE]: OS/2 version of sanei_scsi_cmd().
(sanei_scsi_cmd, sanei_scsi_req_wait) [STUBBED_INTERFACE]:
Return proper value.
* include/sane/config.h.in (HAVE_STRNCASECMP, HAVE_OS2_H): Add
#undef. If !HAVE_STRNCASECMP, define strncasecmp macro as
alias for strnicmp.
@@ -1739,7 +1739,7 @@ Tue Oct 7 15:44:33 1997 Kazuhiro Sasayama <kaz@hypercore.co.jp>
[USE = OS2_INTERFACE]: OS/2 version of sanei_scsi_cmd().
(sanei_scsi_cmd, sanei_scsi_req_wait) [STUBBED_INTERFACE]:
Return proper value.
* include/sane/config.h.in (HAVE_STRNCASECMP, HAVE_OS2_H): Add
#undef. If !HAVE_STRNCASECMP, define strncasecmp macro as
alias for strnicmp.
@@ -2226,7 +2226,7 @@ Wed Jun 18 15:42:25 1997 David Mosberger-Tang <davidm@azstarnet.com>
* doc/sane.tex (section{Image Data Format}}): Clarify
what valid bit-depths are.
Tue Jun 17 07:47:51 1997 David Mosberger-Tang <davidm@azstarnet.com>
* backend/qcam.c (sane_get_parameters): Test for != QC_COLOR
@@ -2748,7 +2748,7 @@ Sun Apr 20 09:09:06 1997 David Mosberger-Tang <davidm@azstarnet.com>
* frontend/Makefile.in: Ditto.
* backend/Makefile.in: Ditto.
* sanei/Makefile.in: Ditto.
* frontend/saned.c (_PATH_HEQUIV): Define if not defined yet..
* configure.in: Check for libgimp/gimp.h instead of -lgimp since
ChangeLogs/ChangeLog-1.0.1
+5 -5
View File
@@ -67,7 +67,7 @@
* doc/sane-umax-doc.html: Ditto.
* doc/sane-umax-doc.tex: Ditto.
* doc/sane-umax-doc.man: Ditto.
1999-04-06 Petter Reinholdtsen <pere@td.org.uit.no>
* backend/snapscan.c (sane_exit sane_get_devices): Removed memory
@@ -116,7 +116,7 @@
* configure.in (V_REV): New variable.
(VERSION): Include ${V_REV} in vesion number.
Substitute V_REV.
* backend/umax.c (umax_do_request_sense): Make "static".
* backend/canon.h: Move array "option_name"...
@@ -222,7 +222,7 @@
BRY advanced options.
* backend/umax.c: Updated with Oliver's latest version.
* doc/sane-sharp.man: New file (by Kazuya Fukuda).
* backend/sharp.c: Updated with Kazuya's latest version.
* backend/sharp.h: Ditto.
@@ -302,7 +302,7 @@
* backend/snapscan.c (gamma_8): Make static.
(start_reader): Ditto.
* backend/microtek.c (do_precalibrate): Make static.
(finagle_precal): Ditto.
(pack_flat_data): Ditto.
@@ -446,4 +446,4 @@
s->val[foo].w not s->val[foo]. The latter compiles on gcc-2.7.2.3
without warning but causes an error on other compilers (e.g.,
egcs).
ChangeLogs/ChangeLog-1.0.10
+27 -27
View File
@@ -155,7 +155,7 @@
2003-01-17 Henning Meier-Geinitz <henning@meier-geinitz.de>
* configure configure.in include/sane/config.h.in sanei/sanei_scsi.c:
Disable the new Linux SG interface for sparc64 to work-around 32 bit
Disable the new Linux SG interface for sparc64 to work-around 32 bit
userland / 64 bit kernel problems.
* doc/descriptions/unsupported.desc: Added HP ScanJet 3500c, 3530c,
3570c, 3570cxi, 5500C and Microtek ScanMaker 3800. Updated link for
@@ -198,7 +198,7 @@
2003-01-13 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/descriptions/unsupported.desc: Added HP ScanJet 2300C and various chipset
information for the unsupported Plustek devices
information for the unsupported Plustek devices
* doc/descriptions/plustek.desc: cleanup
@@ -306,9 +306,9 @@
<morais@inocam.com>). Added detection of Genius Colorpage Vivid3x.
It's unknown if it works. Updated .desc file. Don't print calib line
warnings by default.
* doc/descriptions/microtek2.desc: Updated (From Karsten Festag
* doc/descriptions/microtek2.desc: Updated (From Karsten Festag
<karsten.festag@gmx.de>).
* po/Makefile.in po/sane-backends.pt.po: Added Portuguese translation
* po/Makefile.in po/sane-backends.pt.po: Added Portuguese translation
for the gt68xx backend (from Pedro Morais <morais@inocam.com>).
* po/sane-backends.de.po: Added some missing translations. Removed some
(wrong) fuzzy translations.
@@ -316,17 +316,17 @@
2003-01-08 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* doc/descriptions/snapscan.desc:
Added entries for Acer/Benq 310U, 320U, 340U and
Added entries for Acer/Benq 310U, 320U, 340U and
Mitsubishi Diamondview 650U
* backend/snapscan.c backend/snapscan.h backend/snapscan-scsi.c
backend/snapscan.conf: Backend version 1.4.18, added support for
Acer/Benq310U, fixed color correction for Agfa SnapScan 300
backend/snapscan.conf: Backend version 1.4.18, added support for
Acer/Benq310U, fixed color correction for Agfa SnapScan 300
2003-01-08 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/hpsj5s.desc doc/descriptions-external/hp4200.desc:
Use uniform model names for HP scanners.
* doc/descriptions/unsupported.desc: Added Canon CanoScan D1250U2
* doc/descriptions/unsupported.desc: Added Canon CanoScan D1250U2
and HP ScanJet 4400C.
* po/artec_eplus48u.de.po po/epson.de.po po/epson.ru.po
po/epson.sv.po po/gt68xx.de.po po/matsushita.fr.po
@@ -343,7 +343,7 @@
are now in the per-language sane-backends.??.po files.
* TODO: Updated .desc file, mapages, sanei_usb and OS/2 entries. Removed
entry about po files.
* po/Makefile.in: Remove sane-backends.pot from list of distributed
* po/Makefile.in: Remove sane-backends.pot from list of distributed
files. Add microtek2 files.
* backend/microtek2.c backend/microtek2.h: Improved support for
Scanmaker X12USL. Alpha support for Scanmaker 9800XL. Some bugfixes.
@@ -370,7 +370,7 @@
2003-01-07 Stéphane Voltz <svoltz@wanadoo.fr>
* doc/sane-umax_pp.man: updates and fixes
* doc/descriptions/umax_pp.desc: change model form HP3200C to
* doc/descriptions/umax_pp.desc: change model form HP3200C to
Scanjet 3200C
2003-01-07 Matthew Duggan <stauff1@users.sourceforge.net>
@@ -384,15 +384,15 @@
doc/descriptions/dc240.desc, doc/descriptions/gphoto2.desc:
Update author information
* backend/dc25.c: Fix compiler warning
* backend/dc25.c: Fix compiler warning
* backend/dc210.c, backend/dc240.c, backend/dc210.conf,
* backend/dc210.c, backend/dc240.c, backend/dc210.conf,
backend/dc240.conf, backend/gphoto2.conf, backend/dc25.conf:
Irix fixes from mailing list
2003-01-05 Peter Fales <peter@fales-lorenz.net>
* backend/dc25.c: Mailing list fix. Change = to ==
* backend/dc25.c: Mailing list fix. Change = to ==
dc25/dc20 tests.
2003-01-05 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -448,8 +448,8 @@
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.
* doc/descriptions-external/hp4200.desc
doc/descriptions-external/hpoj.desc: Use Hewlett-Packard consitantly
* doc/descriptions-external/hp4200.desc
doc/descriptions-external/hpoj.desc: Use Hewlett-Packard consitantly
(instead of HP).
* doc/descriptions-external/scanwit.desc
doc/descriptions-external/viceo.desc: Added description files for
@@ -458,7 +458,7 @@
* backend/test.c doc/descriptions/test.desc: Make sure that frontend bugs
concerning the select fd are detected.
* doc/sane-scsi.man: Minor formatting change.
* sanei/sanei_usb.c: Explicitely set first configuration. When claiming
* sanei/sanei_usb.c: Explicitely set first configuration. When claiming
the interface, use the interface number from bInterfaceNumber.
Explicitely set the alternative setting. When closing, call clear_halt,
and reset_ep, and release_interface explicitley. On errors in
@@ -525,7 +525,7 @@
Updated links.
* backend/test.c po/sane-backends.de.po: Minor spelling and translation
fixes.
2002-12-04 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/epson_scsi.c backend/sm3600.c: Move config.h include to the
@@ -551,7 +551,7 @@
* configure.os2: Removed. No longer necessary.
2002-12-04 Matthew Duggan <stauff1@users.sourceforge.net>
* backend/canon_pp-dev.c: Don't compare firmware version numbers -
* backend/canon_pp-dev.c: Don't compare firmware version numbers -
multiple versions do actually exist.
* doc/descriptions/canon_pp.desc: Bump version number.
@@ -574,7 +574,7 @@
2002-12-01 Rene Rebe <rene.rebe@gmx.net>
* backend/avision.h backend/avision.c backend/avision.conf
doc/descriptions/avision.desc: updated the Avision backend -
doc/descriptions/avision.desc: updated the Avision backend -
including auto-generated .desc file listing all devices
also present in the avision.c device-list.
* doc/descriptions/avision.desc: syntax fix
@@ -609,7 +609,7 @@
in do_stop: really print exit status of reader process.
* doc/sane-usb.man: PACKAGEVERSION fix. Removed HP exception. Added
MacOS X.
* doc/gamma4scanimage.man doc/sane-artec_eplus48u.man
* doc/gamma4scanimage.man doc/sane-artec_eplus48u.man
doc/sane-config.man doc/sane-find-scanner.man doc/sane-gt68xx.man
doc/sane-mustek.man doc/sane-mustek_usb.man doc/sane.man
doc/saned.man doc/scanimage.man: Added missing quotes around
@@ -661,7 +661,7 @@
2002-11-23 Max Vorobiev <pcwizard@yandex.ru>
* backend/hpsj5s.c: Removed default port probing.
2002-11-22 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/sane.man: Formatting fixes. Updates some backend entries and
@@ -782,7 +782,7 @@
* backend/umax_pp.c: revert a experimental change that went into
cvs by mistake.
* po/umax_pp.de.po: switch to iso-8858-1
2002-11-07 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/gt68xx.c backend/gt68xx_devices.c backend/gt68xx_high.h
@@ -820,7 +820,7 @@
found. Use msgcat if available. Don't update the .po files
automatically.
* TODO: Added entries about canon.c model extraction bug, and sanei_usb
issue. Updated entries about MAcOS X support. Removed po files entry.
issue. Updated entries about MAcOS X support. Removed po files entry.
2002-10-31 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -831,10 +831,10 @@
2002-10-31 Stéphane Voltz <svoltz@wanadoo.fr>
* backend/umax_pp.c backend/umax_pp.h backend/umax_pp_low.h
* backend/umax_pp.c backend/umax_pp.h backend/umax_pp_low.h
backend/umax_pp_low.c tools/umax_pp.c: add UTA detection,
version number updates
2002-10-30 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -843,8 +843,8 @@
2002-10-27 Peter Fales <peter@fales-lorenz.net>
* configure, acinclude.m4, aclocal.m4 - Remove checks for
specific version numbers of gphoto2 - that's not good for long
* configure, acinclude.m4, aclocal.m4 - Remove checks for
specific version numbers of gphoto2 - that's not good for long
term maintenance, and the API has settled down enough that all
recent versions (both releases and CVS) are workable for SANE.
It is still necessary to specify --with-gphoto2 if you want to
ChangeLogs/ChangeLog-1.0.12
+33 -33
View File
@@ -107,7 +107,7 @@
2003-05-07 Henning Meier-Geinitz <henning@meier-geinitz.de>
* po/Makefile.in po/sane-backends.no.po: Added Norwegian
translation (from Sigurd Stordal <sigurd.stordal@stud.ibg.uit.no>).
translation (from Sigurd Stordal <sigurd.stordal@stud.ibg.uit.no>).
2003-05-06 Michael Herder <crapsite@gmx.net>
@@ -122,8 +122,8 @@
2003-05-05 Henning Meier-Geinitz <henning@meier-geinitz.de>
* po/sane-backends.fr.po: Updates for the French translation from
Yann E. MORIN <yann dot morin dot 1998 at anciens dot enib dot fr>.
* tools/check-po.awk: Added script to check the translations for
Yann E. MORIN <yann dot morin dot 1998 at anciens dot enib dot fr>.
* tools/check-po.awk: Added script to check the translations for
completeness (from Yann E. MORIN).
* tools/README: Added description of check-po.awk. Minor reordering.
@@ -138,7 +138,7 @@
* TODO: Removed obsololete entries.
* NEWS: Updated for 1.0.12.
* backend/ibm.c backend/ibm-scsi.c: Only disable object position
command for Ricoh IS-420.
command for Ricoh IS-420.
2003-05-04 Oliver Rauch <Oliver.Rauch@XSane.org>
@@ -185,7 +185,7 @@
* backend/snapscan.c backend/snapscan.h backend/snapscan-options.c
backend/snapscan-scsi.c doc/descriptions/snapscan.desc: SnapScan
backend 1.4.26, added support for Agfa Arcus 1200, better support
backend 1.4.26, added support for Agfa Arcus 1200, better support
for Benq 5000.
2003-04-30 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -322,7 +322,7 @@
doc/descriptions-external/v4l2.desc
doc/descriptions-external/viceo.desc: Added comments to explain
the reasons for not including these backends into SANE.
2003-04-16 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/scanimage.man: Added EXAMPLES section.
@@ -333,8 +333,8 @@
* AUTHORS backend/Makefile.in backend/dll.conf backend/ibm-scsi.c
backend/ibm.c backend/ibm.conf backend/ibm.h doc/Makefile.in
doc/sane.man doc/sane-ibm.man doc/.cvsignore
doc/descriptions/ibm.desc: Added IBM backend for the
doc/sane.man doc/sane-ibm.man doc/.cvsignore
doc/descriptions/ibm.desc: Added IBM backend for the
IBM 2456, the Ricoh IS-420 and maybe the IS-410 and IS-430 from
mf <massifr@tiscalinet.it>. Added manual page, fixed some
warnings, Added detection for IS-410 and IS-430.
@@ -344,7 +344,7 @@
support it.
* doc/sane-ibm.man doc/descriptions/ibm.desc: Mention alpha
quality. Add maintainer address.
2003-04-14 Henning Meier-Geinitz <henning@meier-geinitz.de>
* tools/sane-desc.c: Fixed some HTML bugs.
@@ -383,7 +383,7 @@
* TODO: Removed license issue. Updated desc files and global
variables entries. Updated v4l entry.
* doc/scanimage.man: --batch format doesn't work, only --batch=format.
2003-04-10 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/test.c backend/test.h doc/descriptions/test.desc: Added
@@ -393,7 +393,7 @@
* backend/canon630u-common.c: Removed last change in offset/gain
calculation, which croaked for some cases. Give up early if we
can't talk on the USB.
can't talk on the USB.
* backend/canon630u.c: Added option to force scanner recalibration.
2003-04-04 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -402,7 +402,7 @@
2003-04-03 Eddy De Greef <eddy_de_greef at tiscali dot be>
* TODO: removed mustek_pp entry (Check that global variables are
* TODO: removed mustek_pp entry (Check that global variables are
initialized propperly
2003-04-03 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -415,14 +415,14 @@
* backend/as6e.c: Fixed some warnings.
* backend/coolscan.c backend/coolscan-scsi.h: Fixed a bunch of
compilation warnings.
* backend/djpeg.c: Fixed some warnings.
* backend/dmc.c: Fixed some warnings.
* backend/djpeg.c: Fixed some warnings.
* backend/dmc.c: Fixed some warnings.
2003-04-03 Eddy De Greef <eddy_de_greef at tiscali dot be>
* backend/mustek_pp.c: Fixed a potential crash bug that could be
triggered when calling sane_init/sane_get_devices/sane_exit
multiple times, and fixed some minor bugs to pass the
triggered when calling sane_init/sane_get_devices/sane_exit
multiple times, and fixed some minor bugs to pass the
frontend/tstbackend.c tests.
2003-04-03 Oliver Schwartz <Oliver.Schwartz@gmx.de>
@@ -487,7 +487,7 @@
2003-03-28 Oliver Schirrmeister <oschirr@abm.de>
* backend/fujitsu.c backend/fujitsu-scsi.h:
* backend/fujitsu.c backend/fujitsu-scsi.h:
now really supports the fi-4120C
2003-03-26 Karl Heinz Kremer <khk@khk.net>
@@ -506,7 +506,7 @@
* doc/descriptions/unsupported.desc: Added Canon CanoScan FB620U.
Added more info for HP ScanJet 3500c.
2003-03-24 Rene Rebe <rene.rebe@gmx.net>
* include/sane/sanei_usb.h sanei/sanei_usb.c: support for
@@ -544,12 +544,12 @@
* backend/fujitsu.c backund/fujitsu-scsi.h backend/fujitsu.h
* patch from Ron Cemer <ron@roncemer.com>
fixes the broken "ADF empty" detection on the Fujitsu scanners
fixes the broken "ADF empty" detection on the Fujitsu scanners
when connected via USB. It also fixes a sense-request issues,
which were required in order to determine whether the ADF is
which were required in order to determine whether the ADF is
empty. It also eliminates some duplicate code blocks.
* renamed some functions
2003-03-13 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/gt68xx.c backend/gt68xx_devices.c backend/gt68xx_low.h
@@ -568,11 +568,11 @@
* backend/fujitsu.c backund/fujitsu-scsi.h
displays the offending byte when something is wrong in the
window descriptor block.
2003-03-09 Eddy De Greef <eddy_de_greef at tiscali dot be>
* backend/mustek_pp_cis.c backend/mustek_pp_cis.h: Fixed two
calibration bugs: one occasionally caused overexposed images at
calibration bugs: one occasionally caused overexposed images at
all resolutions; the other one occasionally caused color inbalances
when scanning narrow areas at high resolutions.
@@ -676,7 +676,7 @@
or 0x04.
* doc/descriptions/unsupported.desc: Added Compaq S4 100 and Microtek
Scanmaker 4800.
2003-02-26 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions-external/hp5400.desc: Added description for hp5400
@@ -710,9 +710,9 @@
2003-02-23 Stéphane Voltz <svoltz@wanadoo.fr>
* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.c
backend/umax_pp_mid.h backend/umax_pp.c backend/umax_pp.h
backend/umax_pp.conf tools/umax_pp.c doc/sane-umax_pp.man: changed
* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.c
backend/umax_pp_mid.h backend/umax_pp.c backend/umax_pp.h
backend/umax_pp.conf tools/umax_pp.c doc/sane-umax_pp.man: changed
highlight option to contrast, and gain to brightness.
2003-02-24 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -783,7 +783,7 @@
2003-02-20 Oliver Schirrmeister <oschirr@abm.de>
* backend/fujitsu.c: make option RIF available for 3091 and 3092, bugfix
* backend/fujitsu.c: set availability of options THRESHOLD und VARIANCE
2003-02-20 Oliver Schirrmeister <oschirr@abm.de>
* backend/fujitsu.c, backend/fujitsu.h: patch from <ron@roncemer.com>:
fi4220 support
@@ -791,7 +791,7 @@
2003-02-19 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions-external/ma1509.desc: Added description of the
* doc/descriptions-external/ma1509.desc: Added description of the
ma1509 backend for Mustek BearPaw 1200F scanners.
* doc/descriptions/unsupported.desc: Added Avision, Brother, and Umax
scanners. Removed Mustek BearPaw 1200F.
@@ -842,7 +842,7 @@
2003-02-15 Karl Heinz Kremer <khk@khk.net>
* backend/epson.c backend/epson_usb.[ch]: Fix problem with
* backend/epson.c backend/epson_usb.[ch]: Fix problem with
"usb <vendor> <product> syntax in config file
* backend/epson.c: Move sanei_init_usb() to sane_init(). Thanks
@@ -851,7 +851,7 @@
2003-02-13 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Updated Canon, Fujitsu, and
Plustek entries.
Plustek entries.
* TODO: Added entries about v4l, fujitsu, snapscan.
2003-02-11 Peter Fales <peter@fales-lorenz.net>
@@ -859,10 +859,10 @@
* backend/dll.conf, doc/sane-gphoto2.man: Added a commented out
gphoto2 entry in dll.conf, and mentioned it in the man page.
* backend/gphoto2.c: Bug fixes. Don't coredump if the
* backend/gphoto2.c: Bug fixes. Don't coredump if the
gphoto2.conf file is missing, and don't require a speed to
be set if the usb port is used.
2003-02-11 Peter Kirchgessner <peter@kirchgessner.net>
* backend/hp-handle.c: Fix problem with ifdef/ifndef for threads
ChangeLogs/ChangeLog-1.0.13
+35 -35
View File
@@ -347,7 +347,7 @@
2003-10-16 m. allan noah <anoah at pfeiffer dot edu>
* backend/fujitsu.c: memset the device struct and the scsi buff
when a new device is attached. Submitted by
when a new device is attached. Submitted by
Chris Chesney <cchesney at go-integral dot com>.
Initialized a couple vars in the 3091 init routines.
@@ -368,7 +368,7 @@
* doc/descriptions/unsupported.desc: Added Pentax, Sicos, Syscan,
and UMAX scanners.
2003-10-13 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/gt68xx_low.c: Fixed compilation bug when debugging is
@@ -644,9 +644,9 @@
* po/Makefile.in: Added plustek_pp.c.
* po/sane-backends.nl.po: Updated Dutch translation (from Martin
Kho <mkho@xs4all.nl>).
* po/sane-backends.bg.po po/sane-backends.cs.po po/sane-backends.de.po
po/sane-backends.es.po po/sane-backends.fr.po po/sane-backends.it.po
po/sane-backends.no.po po/sane-backends.pt.po po/sane-backends.ru.po
* po/sane-backends.bg.po po/sane-backends.cs.po po/sane-backends.de.po
po/sane-backends.es.po po/sane-backends.fr.po po/sane-backends.it.po
po/sane-backends.no.po po/sane-backends.pt.po po/sane-backends.ru.po
po/sane-backends.sv.po: Regenerated.
* doc/Makefile.in: Fixed link to image in HTML manpages.
@@ -668,10 +668,10 @@
information. Spelling fixes. Minor updates.
* doc/sane.man: Updated contact information. Removed contributing
section (now on homepage). Spelling fixes, general updates.
* sane-abaton.man sane-agfafocus.man sane-apple.man sane-bh.man
sane-dc210.man sane-dc240.man sane-dc25.man sane-gphoto2.man
sane-hp.man sane-microtek2.man sane-microtek.man
sane-mustek.man sane-mustek_pp.man sane-pint.man
* sane-abaton.man sane-agfafocus.man sane-apple.man sane-bh.man
sane-dc210.man sane-dc240.man sane-dc25.man sane-gphoto2.man
sane-hp.man sane-microtek2.man sane-microtek.man
sane-mustek.man sane-mustek_pp.man sane-pint.man
sane-st400.man sane-usb.man sane-v4l.man: Updated links to
sane-devel and SANE homepage.
* sane.tex: Changed homepage and sane-devel-request address.
@@ -734,12 +734,12 @@
2003-09-21 Henning Meier-Geinitz <henning@meier-geinitz.de>
* tools/sane-desc.c: PATH_MAX is too small for long comments on
win32. Actually return 0 if there is no second quotation mark.
win32. Actually return 0 if there is no second quotation mark.
Patch from Frank Zago <fzago at austin dot rr dot com>. Check
for !word everywhere to avoid segfaults when a quotation mark is
missing.
* sanei/sanei_config.c: Actually return 0 if there is no second
quotation mark.
quotation mark.
* backend/ma1509.c backend/mustek.c backend/mustek_usb.c
backend/test.c doc/descriptions/ma1509.desc
doc/descriptions/mustek.desc doc/descriptions/mustek_usb.desc
@@ -761,7 +761,7 @@
(patch from Malcolm Parsons <malcolm.parsons@virgin.net>)
* configure.in configure include/sane/config.h.in: added detection of
machine/cpufunc.h and i386_set_ioperm() for FreeBSD support.
2003-09-16 Stéphane Voltz <svoltz@wanadoo.fr>
@@ -848,7 +848,7 @@
2003-08-21 Karl Heinz Kremer <khk@khk.net>
* backend/epson.c: Removed '//' comments - again ...
Added EPSON KOWA copyright
Added EPSON KOWA copyright
2003-08-21 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -873,8 +873,8 @@
2003-08-15 Karl Heinz Kremer <khk@khk.net>
* backend/epson.[ch]: Added support for GT-30000, with support for the
ADF in simplex mode (used some code from the EPSON Kowa IScan version
* backend/epson.[ch]: Added support for GT-30000, with support for the
ADF in simplex mode (used some code from the EPSON Kowa IScan version
of the backend)
* backend/epson_scsi.c: Use sanei_scsi_cmd2() to send commands to fix a problem
with SBP-2 under FreeBSD
@@ -884,7 +884,7 @@
* backend/umax_pp.c backend/umax_pp.h: added a check of values passed
in gamma table. Fixed a bug which prevented custom gamm and UTA to be
active
2003-08-14 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/sane-plustek.man: Added debug description
@@ -939,7 +939,7 @@
2003-07-28 Henning Meier-Geinitz <henning@meier-geinitz.de>
* po/Makefile.in po/sane-backends.bg.po: Added Bulgarian
translation (from Pavel Constantinov
translation (from Pavel Constantinov
<pavelconstantinov@bigfoot.com>).
2003-07-28 Thomas Soumarmon <thomas.soumarmon@cogitae.net>
@@ -962,10 +962,10 @@
2003-07-26 Peter Fales <peter@fales-lorenz.net>
* sanei/Makefile.in, backend/cderror.h, backend/jinclude.h,
backend/dc210.c, backend/dc240.c, backend/ gphoto2.c,
backend/dc210.c, backend/dc240.c, backend/ gphoto2.c,
backend/djpeg.c, backend/cdjpeg.h, backend/Makefile.in, configure
configure.in, frontend/Makefile.in: Move jpeg support file
to sanei directofiles to include/sane, and associated
configure.in, frontend/Makefile.in: Move jpeg support file
to sanei directofiles to include/sane, and associated
configure changes
2003-07-26 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -982,12 +982,12 @@
* sanei/linux_sg3_err.h: Added GPL + SANE exception license.
2003-07-25 Peter Fales <peter@fales-lorenz.net>
* include/sane/sanei_cderror.h, include/sane/sanei_jinclude.h
* include/sane/sanei_cderror.h, include/sane/sanei_jinclude.h
include/sane/sanei_jpeg.h sanei/sanei_jpeg.c: Install these
files as copies of the ones currently in backend. (The old
files will be deleted later)
* Moved backend/djpeg.README to README.djpeg and added usage info
2003-07-25 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/gt68xx.c backend/gt68xx.conf doc/sane-gt68xx.man
@@ -1005,7 +1005,7 @@
license to GPL + SANE exception.
* TODO: Added canon630u SANE_I18N and include file license
problem. Updated .desc file section.
2003-07-24 Peter Kirchgessner <peter@kirchgessner.net>
* backend/hp.c, backend/hp-option.h, backend/hp-option.c
@@ -1043,12 +1043,12 @@
2003-07-21 Stéphane Voltz <svoltz@wanadoo.fr>
* doc/descriptions/umax_pp.desc: removed unwanted status line for
* doc/descriptions/umax_pp.desc: removed unwanted status line for
backend
2003-07-20 Stéphane Voltz <svoltz@wanadoo.fr>
* doc/descriptions/umax_pp.desc: updated forgotten status to use new
* doc/descriptions/umax_pp.desc: updated forgotten status to use new
keyword.
2003-07-20 Oliver Rauch <oliver.rauch@rauch-domain.de>
@@ -1128,7 +1128,7 @@
* doc/descriptions/unsupported.desc: Added Memorex, Visioneer and
Xerox scanners. Updated information for Visioneer scanners.
2003-06-28 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Visioneer OneTouch 5800
@@ -1161,12 +1161,12 @@
* doc/descriptions/mustek_pp.desc: Updated status fields of CIS type
scanners.
2003-06-19 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions.txt: Changed unmaintained tag to lowercase.
* doc/descriptions/template.desc.
doc/descriptions-external/template.desc.: Updated according to
* doc/descriptions/template.desc.
doc/descriptions-external/template.desc.: Updated according to
descriptions.txt.
* doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
doc/gt68xx/gt68xx.CHANGES: Added RevScan 19200i. Updated
@@ -1215,7 +1215,7 @@
2003-06-15 Henning Meier-Geinitz <henning@meier-geinitz.de>
* README.darwin: Minor updates.
* TODO: Added v4l2 problem, desc file issues. Removed sm3600
* TODO: Added v4l2 problem, desc file issues. Removed sm3600
MacOS X problem + printing backends in configure.
* doc/descriptions/unsupported.desc: Added Canon D2400UF
and IS 12.
@@ -1230,9 +1230,9 @@
2003-06-11 Oliver Schirrmeister <oschirr@abm.de>
* backend/fujitsu.c: fixed bug in that code when a scanner is
* backend/fujitsu.c: fixed bug in that code when a scanner is
disconnected (anoah at pfeiffer dot edu)
2003-06-10 Michael Herder <crapsite@gmx.net>
* po/Makefile.in: Added Czech translation
@@ -1263,7 +1263,7 @@
backend/hp5400.h
backend/hp5400_internal.c
backend/hp5400_sanei.c
backend/hp5400_xfer.h
backend/hp5400_xfer.h
to compile and run (on linux 2.4.21) as SANE backend and
in the corresponding hp5400backend sourceforge project
@@ -1307,7 +1307,7 @@
2003-06-03 Oliver Schirrmeister <oschirr@abm.de>
* backend/fujitsu.c, backend/fujitsu.h: separated the 4x20
* backend/fujitsu.c, backend/fujitsu.h: separated the 4x20
into another model and color support for the 4x20
2003-06-03 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -1328,7 +1328,7 @@
* PROJECTS: Changed entry for win32 SANE project.
2003-05-28 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.html: Added link for Umax astra 4700.
2003-05-27 Henning Meier-Geinitz <henning@meier-geinitz.de>
ChangeLogs/ChangeLog-1.0.14
+26 -26
View File
@@ -72,9 +72,9 @@
* backend/snapscan-mutex.c: Fixed compilation problem on OS/2
(Thanks to Franz Bakan).
* configure.in configure: SnapScan backend now compiled in by
* configure.in configure: SnapScan backend now compiled in by
default on OS/2
2004-04-15 Marian Eichholz <eichholz@computer.org>
* backend/sm3600.h backend/sm3600-scanmtek.c
@@ -178,7 +178,7 @@
* backend/test.c changed some option group headers to advanced option
menu.
2004-04-06 Jochen Eisinger <jochen@penguin-breeder.org>
* sanei/sanei_pa4s2.c include/sane/sanei_pa4s2.h, backend/mustek_pp.c:
@@ -209,7 +209,7 @@
2004-04-02 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c backend/snapscan-options.c
* backend/snapscan.c backend/snapscan-options.c
backend/snapscan-scsi.c:
Various bugfixes for gamma correction (Thanks to Robert Tsien)
* po/sane-backends.de.po: Fix translation for "gamma table"
@@ -232,8 +232,8 @@
* backend/gt68xx.c backend/gt68xx_devices.c
backend/gt68xx_gt6801.c backend/gt68xx_gt6816.c
backend/gt68xx_high.c doc/descriptions/gt68xx.desc
doc/gt68xx/gt68xx.CHANGES: Plustek U16B: Added
GT68XX_FLAG_SE_2400. Fixed color order.Increased debug
doc/gt68xx/gt68xx.CHANGES: Plustek U16B: Added
GT68XX_FLAG_SE_2400. Fixed color order.Increased debug
level for setup_scan. Fixed CCD ocarse calibration.
* doc/descriptions/microtek.desc: Added Agfa Studiostar.
* doc/descriptions/unsupported.desc: Added Avigramm Minidoc,
@@ -260,7 +260,7 @@
since new models use new ID strings.
2004-03-21 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/mustek.c doc/descriptions/mustek.desc
doc/mustek/mustek.CHANGES: Added detection of Mustek ScanExpress
1200 FS.
@@ -332,10 +332,10 @@
to scanner pages.
2004-03-04 Oliver Schirrmeister <oschirr@abm.de>
* backend/fujitsu.c
* backend/fujitsu.c
enabled dropoutcolor for fi4x20C
2004-03-04 Oliver Schirrmeister <oschirr@abm.de>
* backend/fujitsu.c
* backend/fujitsu.c
enabled dropoutcolor for fi4530C
2004-03-03 Gerhard Jaeger <gerhard@gjaeger.de>
@@ -421,7 +421,7 @@
2004-02-08 Karl Heinz Kremer <khk@khk.net>
* backend/epson*.[ch]: Reformat source code to get rid of different coding styles
used over the years (and by different authors).
used over the years (and by different authors).
2004-02-08 Frank Zago <fzago at austin dot rr dot com>
* README.windows: added info about USB scanners.
@@ -454,13 +454,13 @@
* backend/mustek_pp.conf: fixed mistakes in examples
2004-02-07 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Genius Colorpage Vivid
1200EX and Mustek Paragon 800 II EP.
2004-02-04 Henning Meier-Geinitz <henning@meier-geinitz.de>
* sanei/sanei_usb.c: Fixed inconsistent error message (patch from
* sanei/sanei_usb.c: Fixed inconsistent error message (patch from
Mattias Ellert <mattias.ellert@tsl.uu.se>).
2004-02-01 Gerhard Jaeger <gerhard@gjaeger.de>
@@ -627,7 +627,7 @@
* AUTHORS: added myself as u12 backend author.
* backend/Makefile.in: added new backend u12.
* backend/u12.c backend/u12.h backend/u12-scanner.h backend/u12-hwdef.h
backend/u12.conf backend/u12-shading.c backend/u12-tpa.c
backend/u12.conf backend/u12-shading.c backend/u12-tpa.c
backend/u12-ccd.c backend/u12-hw.c backend/u12-if.c backend/u12-image.c
backend/u12-io.c backend/u12-map.c backend/u12-motor.c:
initial checkin.
@@ -646,9 +646,9 @@
bug in the stop scan function for Plustek U16b. Added support
for Genius Vivid4xe.
* doc/descriptions/unsupported.desc: Added Visioneer 8820 and TCE S450.
2003-12-31 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added HP and Epson scanners.
2003-12-29 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -723,11 +723,11 @@
* doc/descriptions/unsupported.desc: Added Canon 3200F.
* backend/gt68xx_gt6801.h: Made internal function static.
2003-12-15 Oliver Schirrmeister <oschirr@abm.de>
* backends/fujitsu.[hc]: Bugfix: The options pagewidth and
pageheight were disabled for the fi4530
2003-12-15 Eugene Weiss <eweiss@sbcglobal.net>
* backend/as6e.c: fixed bugs 300123 and 300133.
@@ -752,7 +752,7 @@
* AUTHORS: Eugene S. Weiss has CVS write access now.
* doc/descriptions/unsupported.desc: Added and updated some
scanners.
scanners.
* tools/sane-find-scanner.c: Actually use the number of the alt
setting when printing descriptors. Fixes bug #300383 found by
Gerard Klaver.
@@ -792,7 +792,7 @@
* doc/descriptions/unsupported.desc: Added some scanners.
2003-12-06 Peter Fales <peter@fales-lorenz.net>
* acinclude.m4, aclocal.m4, configure: gphoto2 backend is now
* acinclude.m4, aclocal.m4, configure: gphoto2 backend is now
enabled by default if gphoto2-config is found. Use
"--with-gphoto2=no" to disable it.
@@ -814,14 +814,14 @@
removed compiler warnings, made HMG's fix for bug #300257
permament.
* doc/sane-canon630u.man: cleanup
2003-12-01 Jochen Eisinger <jochen@penguin-breeder.org>
* backend/mustek_pp_ccd300.c: Fixed horizontal offset of scan area
and scaling for color scans
2003-11-27 Karl Heinz Kremer <khk@khk.net>
* doc/descriptions/epson.desc: Changed status for CX3200 and
CX5200 from untested to good
@@ -862,13 +862,13 @@
2003-11-23 Jochen Eisinger <jochen@penguin-breeder.org>
* backend/mustek_pp.c, sanei/sanei_pa4s2.c: added support for auto
* backend/mustek_pp.c, sanei/sanei_pa4s2.c: added support for auto
probing of the port
* configure{.in}, backend/mustek_pp_ccd.*, backend/Makefile.in,
backend/dll.conf, doc/sane-mustek_pp_ccd.man, doc/sane.man,
doc/Makefile.in, doc/descriptions/mustek_pp_ccd.desc: mustek_pp_ccd
backend/dll.conf, doc/sane-mustek_pp_ccd.man, doc/sane.man,
doc/Makefile.in, doc/descriptions/mustek_pp_ccd.desc: mustek_pp_ccd
backend removed
* backend/mustek_pp.conf, mustek_pp_ccd300.[ch],
* backend/mustek_pp.conf, mustek_pp_ccd300.[ch],
doc/sane-mustek_pp.man, doc/descriptions/mustek_pp.desc: fixed CCD
support for mustek_pp backend
* backend/mustek_pp_null.c: beautified debug scanner name
ChangeLogs/ChangeLog-1.0.15
+57 -57
View File
@@ -51,7 +51,7 @@
* backend/niash_core.c backend/niash.c: moving critical timing
for backward movement to niash_core
2004-10-24 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc
@@ -84,7 +84,7 @@
2004-10-19 Gerhard Jaeger <gerhard@gjaeger.de>
* backend/plustek.c: Using now the same strings for gain and offset
* backend/plustek.c: Using now the same strings for gain and offset
like the umax_pp backend (bug #300962).
* doc/plustek/Plustek-USB.changes: Update.
* po/*.po: Update due to changes in the Plustek backend.
@@ -97,8 +97,8 @@
2004-10-18 Ullrich Sigwanz <usigwanz@freesurf.ch>
* backend/niash_core.c:
* backend/niash.c: correcting vertical scanning start
* backend/niash_core.c:
* backend/niash.c: correcting vertical scanning start
point for changed max. page height
2004-10-17 Ullrich Sigwanz <usigwanz@freesurf.ch>
@@ -136,7 +136,7 @@
2004-10-17 Ullrich Sigwanz <usigwanz@freesurf.ch>
* backend/niash_core.c: rewrote buffer portioning
* backend/niash_core.c (2): updated debug info
* backend/niash_core.c (2): updated debug info
* backend/niash.c: Enabling support of full DIN A4 size
2004-10-16 Oliver Rauch <Oliver.Rauch@Rauch-DOmain.DE>
@@ -147,8 +147,8 @@
* doc/descriptions/unsupported.desc: Added various scanners.
* po/sane-backends.da.po: Updated Danish translation (from Mogens
Jaeger <mogensjaeger@get2net.dk>).
Jaeger <mogensjaeger@get2net.dk>).
2004-10-14 Henning Meier-Geinitz <henning@meier-geinitz.de>
* include/sane/sanei_wire.h sanei/sanei_wire.c: Limit the total
@@ -184,7 +184,7 @@
* acinclude.m4 config.guess config.sub configure ltmain.sh: Update
to libtool 1.5.10.
* doc/descriptions/unsupported.desc: Added link to
Microtek Filmscan 35.
Microtek Filmscan 35.
* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_high.c
doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES:
Fixed typos. Added Packard Bell Diamond 2450 to .conf and
@@ -204,7 +204,7 @@
* backend/fujitsu.c: bugfix: 3091 did not work (15.12.2003)
M4099 supported (bw only)
enables brightness
enables brightness
2004-10-10 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -229,14 +229,14 @@
function _UnScrambleLine
* doc/descriptions/niash.desc: changed status to complete
removed the color only comment
2004-10-06 Gerhard Jaeger <gerhard@gjaeger.de>
* backend/plustek.c backend/u12.c backend/plustek_pp.c:
* backend/plustek.c backend/u12.c backend/plustek_pp.c:
Using now the well known MODE definitions.
* backend/plustek.h backend/plustek-usb.h: Cleanup.
* doc/plustek/Plustek-USB.changes
doc/plustek/Plustek-Parport.changes doc/u12/U12.changes:
* doc/plustek/Plustek-USB.changes
doc/plustek/Plustek-Parport.changes doc/u12/U12.changes:
Update.
* po/*.po: Update.
@@ -244,7 +244,7 @@
* backend/microtek2.h doc/descriptions/microtek2.desc: New
version: 0.96. Added Genius ColorPage-EP (from Karsten Festag
<karsten.festag@gmx.de>).
<karsten.festag@gmx.de>).
* doc/descriptions/unsupported.desc: Added link to artiscan 9600
project. Removed Genius ColorPage-EP.
* configure.in include/sane/config.h.in: Removed dangling
@@ -256,7 +256,7 @@
* tools/sane-find-scanner.c: Fixed compilation problem when
compiled without libusb support. Print sane-backends version
number. Print if built without libusb.
* backend/microtek2.c backend/microtek2.h: Added backend version
200410042220 from Karsten Festag <karsten.festag@gmx.de>. While
attaching devices only read attributes from source 0 (=
@@ -276,7 +276,7 @@
descriptors from /proc/bus/usb/devices dumps (e.g. from the
unsupported scanner web pages). Minor modifications to some of
the chipset tests.
2004-10-04 Peter Kirchgessner <peter@kirchgessner.net>
* backend/hp.h backend/hp.c backend/hp-scl.c:
@@ -291,14 +291,14 @@
2004-10-03 Thomas Soumarmon <thomas.soumarmon@cogitae.net>
* backend/hp5400_debug.c backend/hp5400_debug.h
backend/hp5400_internal.c backend/hp5400_sane.c:
* backend/hp5400_debug.c backend/hp5400_debug.h
backend/hp5400_internal.c backend/hp5400_sane.c:
removing more hp5400 compilation warnings
2004-10-03 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Nikon LS-5000 ED (bug
#300972).
#300972).
* include/sane/saneopts.h: Added option for turning off the
scanner's lamp on exit (bug #300963).
* backend/gt68xx.c backend/gt68xx_high.h: Used new lamp option
@@ -330,11 +330,11 @@
* backend/hp5400_internal.c backend/hp5400_internal.h
backend/hp5400_sanei.c backend/hp5400_sanei.h
backend/hp5400_sane.c:
backend/hp5400_sane.c:
removing some compilation warnings
2004-10-02 Thomas Soumarmon <thomas.soumarmon@cogitae.net>
* backend/hp5400_internal.c: hp5400 version mathing test
has been removed by default.
To enable it :
@@ -372,7 +372,7 @@
* doc/descriptions/unsupported.desc: Added Compeye Simplex 1236C.
2004-09-14 Karl Heinz Kremer <khk@khk.net>
* backend/epson_usb.c: add USB device ID for CX6400 back in
* backend/epson.c: disable "feed" command for Perfection 1640 w/ ADF
@@ -389,7 +389,7 @@
doc/descriptions-external/genesys.desc: Moved HP 35xx series to
unsupported.desc because these scanners use a RTS8801 chip (no
Genesys chipset).
2004-09-06 Jochen Eisinger <jochen@penguin-breeder.org>
* backend/mustek_pp.c: clarify error message
@@ -400,7 +400,7 @@
* backend/plustek.c: Bumped build number.
* backend/plustek-usbdevs.c: Fixed bug #300913.
2004-09-05 Julien Blache <jb@jblache.org>
* More auth_callback() fixes, although they're not critical.
@@ -423,7 +423,7 @@
to gt68xx.conf to test yet unsupported scanners without changing
the source code.
* frontend/.cvsignore: Added tstbackend.
2004-09-02 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c backend/snapscan-scsi.c backend/snapscan-options.c
@@ -540,9 +540,9 @@
* backend/dll.conf: Added niash backend.
* backend/Makefile.in: Added niash backend files and target.
* backend/niash.c backend/niash_core.c backend/niash_core.h
backend/niash-xfer.c backend/niash-xfer.h backend/niash-types.h:
backend/niash-xfer.c backend/niash-xfer.h backend/niash-types.h:
Niash backend files, initial checkin.
* doc/sane-niash.man, doc/descriptions/niash.desc, doc/niash/niash.TODO:
* doc/sane-niash.man, doc/descriptions/niash.desc, doc/niash/niash.TODO:
Initial checkin.
* doc/Makefile.in: Added niash documentation stuff.
* doc/sane-man: Added niash manpage.
@@ -559,15 +559,15 @@
2004-07-28 Gerard Klaver <gerard at gkall dot hobby dot nl>
* doc/descriptions/unsupported.desc: Added Logitech PageScan USB and
Grandtek Scopecam
Grandtek Scopecam
2004-07-26 Gerhard Jaeger <gerhard@gjaeger.de>
* sanei/sanei_usb.c sanei/sanei configure configure.in: Added
* sanei/sanei_usb.c sanei/sanei configure configure.in: Added
resource manager library support.
* backend/plustek.[ch] backend/plustek-usbdevs.c backend/plustek-usbhw.c
backend/plustek-usbshading.c backend/plustek.conf: Added speedup
parameters and TPA autodetection for UMAX3400/3450, added
backend/plustek-usbshading.c backend/plustek.conf: Added speedup
parameters and TPA autodetection for UMAX3400/3450, added
disableSpeedup option.
* doc/plustek/Plustek-USB-TODO.txt doc/plustek/Plustek-USB.changes
doc/descriptions/plustek.desc: Updated.
@@ -580,7 +580,7 @@
2004-07-18 Karl Heinz Kremer <khk@khk.net>
* doc/descriptions/epson.desc: Added CX-5400, RX-500 and RX-600; updated version
* doc/descriptions/epson.desc: Added CX-5400, RX-500 and RX-600; updated version
* doc/descriptions/unsupported.desc: Removed RX-500
2004-07-16 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -592,21 +592,21 @@
2004-07-16 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Makefile.module doc/plustek/BUILD
* doc/plustek/Makefile.module doc/plustek/BUILD
doc/plustek/VERSION0 doc/plustek/VERSION1: Removed, no longer needed.
* doc/plustek/Makefile.kernel2x doc/plustek/MakeModule.sh:
Getting version information now out of the backends main file.
* doc/plustek/Plustek_PARPORT.changes: Updated.
* doc/descriptions/plustek_pp.desc: Updated.
* doc/sane-plustek.man: Fixed typo.
* backend/plustek-pp.[ch], backend/plustek-pp_*.[ch]:
Added DevFS support for kernel 2.6, removed floating point
* backend/plustek-pp.[ch], backend/plustek-pp_*.[ch]:
Added DevFS support for kernel 2.6, removed floating point
operations (Thanx to Rafal Rzepecki), bumped up build number,
cleanup work.
* doc/plustek/Plustek_USB.changes: Updated.
* backend/plustek.c: Bumped up build number
* backend/plustek-usbshading.c: Improved autowarmup, cleanup work.
* backend/plustek-usb.h backend/plustek-usbdevs.c
* backend/plustek-usb.h backend/plustek-usbdevs.c
backend/plustek-usbhw.c backend/plustek-usnscan.c: Improved
fastforward stuff, cleanup work.
* sanei/sanei_lm983x.c: Cleanup work.
@@ -618,7 +618,7 @@
2004-07-12 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/sane-coolscan2.man doc/sane-microtek2.man: Fixed
* doc/sane-coolscan2.man doc/sane-microtek2.man: Fixed
manual page problems.
2004-07-10 Gerard Klaver <gerard at gkall dot hobby dot nl>
@@ -646,14 +646,14 @@
* doc/descriptions/plustek.desc: Changed status of CanoScan D660U.
* doc/plustek/Plustek-USB*: Update.
* backend/plustek.c: Bumped up build number.
* backend/plustek-usb.[ch] backend/plustek-usbdevs.c
backend/plustek-usbhw.c backend/plustek-usbimg.c
* backend/plustek-usb.[ch] backend/plustek-usbdevs.c
backend/plustek-usbhw.c backend/plustek-usbimg.c
backend/plustek-usbmap.c backend/plustek-usbscan.c: Added support
for binary scanning for the CanoScan D660U, cleanup work.
2004-07-03 Peter Fales <peter@fales-lorenz.net>
* acinclude.m4, aclocal.m4, configure, tools/sane-config.in:
* acinclude.m4, aclocal.m4, configure, tools/sane-config.in:
When using pkg-config to get library flags for gphoto2, any
extra flags (such as -L) must be passed to sane-config.in so
that it can find the libraries in a non-standard location.
@@ -666,7 +666,7 @@
doc/plustek/Plustek-USB.changes.
* doc/sane-plustek.man: Update.
* doc/plustek/Plustek-USB.changes: Update.
* doc/descriptions/plustek.desc: Removed unsupported devices,
* doc/descriptions/plustek.desc: Removed unsupported devices,
updated some states.
* doc/descriptions/plustek_pp.desc: URL update.
* doc/descriptions/u12.desc: URL update, changed state of backend.
@@ -675,21 +675,21 @@
2004-06-30 Frank Zago <fzago at austin dot rr dot com>
* backend/leo.c doc/descriptions/leo.desc: added support for
* backend/leo.c doc/descriptions/leo.desc: added support for
Genius FS-1130 Colorpage Scanner.
2004-06-30 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Makefile.kernel26: fixed floating point issues
* doc/plustek/Makefile.kernel26: fixed floating point issues
for SuSE kernels.
2004-06-28 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Microtek and Xerox
scanners.
* tools/sane-desc.c: Added xml output (patch from
* tools/sane-desc.c: Added xml output (patch from
jose <jgato@lambdaux.com>). Other minor fixes.
2004-06-28 m. allan noah <anoah at pfeiffer dot edu>
* backend/fujitsu.c: use model code instead of string compare
@@ -697,7 +697,7 @@
2004-06-21 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/descriptions/unsupported.desc: removed Compac S4 100
* doc/descriptions/unsupported.desc: removed Compac S4 100
(supported by the Plustek backend), added various Plustek
devices, changed OpticPro m12 to OpticSlim M12
@@ -720,7 +720,7 @@
2004-06-20 Mattias Ellert <mattias.ellert@tsl.uu.se>
* aclocal.m4, configure, sane/config.h.in, backend/Makefile.in,
* aclocal.m4, configure, sane/config.h.in, backend/Makefile.in,
backend/agfafocus.c, backend/artec_eplus48u.c, backend/avision.c,
backend/coolscan.c, backend/fujitsu.c, backend/pie.c,
backend/plustek.c, backend/plustek_pp.c, backend/sp15c.c,
@@ -775,14 +775,14 @@
2004-06-17 Stéphane Voltz <svoltz@wanadoo.fr>
* backend/umax_pp_low.c doc/descriptions/umax_pp.desc
* backend/umax_pp_low.c doc/descriptions/umax_pp.desc
doc/sane-umax_pp.man:
fixed overflows in 610P shading calibration coefficients,
minor man update, 610P status change from minimal to good
2004-06-16 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.h backend/snapscan.c backend/snapscan-usb.c:
* backend/snapscan.h backend/snapscan.c backend/snapscan-usb.c:
Don't enforce even number of URB packages on 1212u_2 since
it causes problems. See bug #300753.
@@ -811,7 +811,7 @@
2004-06-13 Karl Heinz Kremer <khk@khk.net>
* backend/sane_usb.c: Added Perfection 1650 back in that was removed by
mistake and finally removed Perfection 1250.
mistake and finally removed Perfection 1250.
2004-06-12 Stéphane Voltz <svoltz@wanadoo.fr>
@@ -888,7 +888,7 @@
2004-05-29 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/sp15c.c: Fixed the fix of the sanei_thread fix
* backend/sp15c.c: Fixed the fix of the sanei_thread fix
(from Mattias Ellert).
2004-05-28 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -947,7 +947,7 @@
2004-05-18 Michael Herder <crapmail@nurfuerspam.de>
* backend/Makefile.in:
* backend/Makefile.in:
adjusted for use with sanei_thread and artec_eplus48u backend
(thanks Mattias Ellert)
@@ -968,19 +968,19 @@
2004-05-15 Michael Herder <crapmail@nurfuerspam.de>
* backend/artec_eplus48u.c backend/artec_eplus48u.h:
* backend/artec_eplus48u.c backend/artec_eplus48u.h:
applied patch from Mattias Ellert (thanks), which adds support
for sanei_thread
2004-05-15 Stéphane Voltz <svoltz@wanadoo.fr>
* backend/umax_pp_low.c backend/umax_pp.c tools/umax_pp.c: fixed
* backend/umax_pp_low.c backend/umax_pp.c tools/umax_pp.c: fixed
origin shift bug for 610P. Added on guard against configuration
that can put several 'port' option in conf file.
2004-05-13 Stéphane Voltz <svoltz@wanadoo.fr>
* backend/umax_pp_low.c backend/umax_pp.c tools/umax_pp.c: fixed
* backend/umax_pp_low.c backend/umax_pp.c tools/umax_pp.c: fixed
data lines reordering for 610P
2004-05-12 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -1011,11 +1011,11 @@
* tools/hotplug/libsane.usbmap: removed empty lines, latest
hotplug cannot cope with them
2004-03-15 Stéphane Voltz <svoltz@wanadoo.fr>
* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.c
backend/umax_pp_mid.h backend/umax_pp.c backend/umax_pp.h
backend/umax_pp_mid.h backend/umax_pp.c backend/umax_pp.h
tools/umax_pp.c: added support for 610P
2004-05-01 Henning Meier-Geinitz <henning@meier-geinitz.de>
ChangeLogs/ChangeLog-1.0.16
+56 -56
View File
@@ -26,7 +26,7 @@
* NEWS: Updated.
---- CODE FREEZE FOR SANE 1.0.16 ---
---- CODE FREEZE FOR SANE 1.0.16 ---
2005-07-31 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -35,7 +35,7 @@
2005-07-30 Karl Heinz Kremer <khk@khk.net>
* backend/epson_usb.c: Applied Olaf Meuwissen's patch to add
new device IDs.
new device IDs.
2005-07-30 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -45,7 +45,7 @@
correctly again.
* acinclude.m4 configure configure.in: Avoid error messages in
locking test. Make sure that io/cam/cam.h header file will be
detected correctly.
detected correctly.
2005-07-29 Gerard Klaver <gerard at gkall dot hobby dot nl>
@@ -80,7 +80,7 @@
* doc/descriptions/unsupported.desc: Added unsupported scanners
from hp_rts88xx.desc. Removed HP ScanJet 3770 (now in hp3770
backend). Added Lexmark X75 PrinTrio.
2005-07-22 Giuseppe Sacco <eppesuig@debian.org>
* italian translation update
@@ -89,7 +89,7 @@
* tools/hotplug/libsane.usermap: Added HP ScanJet 7400C (0x03f0,
0x0801), from Thomas Nadolny.
2005-07-21 Gerhard Jaeger <gerhard@gjaeger.de>
2005-07-21 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-USB.changes: Update.
* backend/plustek.c: Bumped build number.
@@ -97,13 +97,13 @@
2005-07-15 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan-options.c: Change TPO range for Epson 2480/2580 to
55x80mm^2 which is the working range for the 2580. Reenabled
* backend/snapscan-options.c: Change TPO range for Epson 2480/2580 to
55x80mm^2 which is the working range for the 2580. Reenabled
2400 DPI for 2480/2580.
2005-07-15 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan-mutex.c backend/snapscan-usb.c: Changes to support
* backend/snapscan-mutex.c backend/snapscan-usb.c: Changes to support
SANE on ZETA.
* backend/snapscan-scsi.c: Fix compiler warnings.
@@ -119,7 +119,7 @@
2005-07-15 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/sp15c.c: Better 4->8 bit depth expansion algorithm (from
* backend/sp15c.c: Better 4->8 bit depth expansion algorithm (from
Mattias Ellert <mattias.ellert@tsl.uu.se>).
* sanei/sanei_usb.c: Fixed comment (we still use 30 seconds USB
timeout by default).
@@ -164,7 +164,7 @@
the USB timeout.
2005-07-10 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/gt68xx.c backend/gt68xx_devices.c
backend/gt68xx_generic.c backend/gt68xx_high.c
doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES
@@ -173,7 +173,7 @@
Visioneer OneTouch 7300. Updated .desc. Moved check for stable
lamp to its own function. Mustek ScanExpress A3 USB: Use CIS
calibration. Use lamp warmup. Fixed CCD on GT6801 scanning (color
scanning was broken due to a change in motormode_2.
scanning was broken due to a change in motormode_2.
2005-07-09 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -186,7 +186,7 @@
po/sane-backends.ru.po po/sane-backends.sv.po: Updated Danish
translation (from Mogens Jaeger <mogensjaeger@get2net.dk>). Made
sure that no errors occur because xgettext/xmsgfmt think that
"%" is a C format string. Regenerated all po files.
"%" is a C format string. Regenerated all po files.
* configure configure.in include/sane/config.h.in: Make sure that
getopt is not built on OS/2 (from Franz Bakan <fbakan@gmx.net>).
@@ -198,7 +198,7 @@
backend/teco1.c backend/teco1.h backend/teco2.c backend/teco2.h
backend/teco3.c backend/teco3.h frontend/tstbackend.c: new
email address.
2005-07-07 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-USB.changes: Update.
@@ -213,7 +213,7 @@
2005-07-04 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-USB.changes: Update.
* backend/plustek.[ch] backend/plustek-usbscan.c
* backend/plustek.[ch] backend/plustek-usbscan.c
backend/plustek-usbshading.c backend/plustek-usbdevs.c
backend/plustek-usbdevs.c backend/plustek-usbimg.c
backend/plustek-usbmap.c backend/plustek-usbhw.c
@@ -229,7 +229,7 @@
* backend/sm3600.c: Don't check the result of
usb_find_busses(). Based on patch from Julien BLACHE
<jb@jblache.org>.
<jb@jblache.org>.
* doc/descriptions/genesys.desc: Used
"Medion/Lifetec/Tevion/Cytron" as manufacturer as in the other
backends. Used "ScanJet 2300C" as model name as in other
@@ -251,14 +251,14 @@
2005-06-30 St�hane Voltz <stefdev@modulonet.fr>
* configure.in AUTHORS backend/dll.conf doc/sane.man doc/Makefile.in
* configure.in AUTHORS backend/dll.conf doc/sane.man doc/Makefile.in
po/Makefile.in : Fixed forgotten modifications when adding the
genesys backend
2005-06-30 Gerhard Jaeger <gerhard@gjaeger.de>
* tools/RenSaneDlls.cmd backend/dll.c: Fixed OS/2 restriction for
dlopening DLLs on OS/2, as it only works for 7.3 filenames for
* tools/RenSaneDlls.cmd backend/dll.c: Fixed OS/2 restriction for
dlopening DLLs on OS/2, as it only works for 7.3 filenames for
some reason (patches by Franz Bakan <fbakan@gmx.net>.
2005-06-27 St�hane Voltz <stefdev@modulonet.fr>
@@ -283,19 +283,19 @@
* doc/descriptions/unsupported.desc: Removed Samsung SCX-4216F
(supported by samsung backend). Dell 1600n has also network
connection.
connection.
* doc/descriptions-external/brother.desc: Removed misleading
comment.
comment.
* doc/descriptions-external/samsung.desc: Added several models,
updated others.
* doc/descriptions.txt: Added "Ethernet" to list of possible
interfaces.
interfaces.
2005-06-12 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Canon CanoScan LiDE
500F.
2005-06-04 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Genius ColorPage-SF600.
@@ -336,12 +336,12 @@
* doc/descriptions/unsupported.desc: Added Avision DS310F. Added link
for the UMAX Astra 4000. Fixed missing link for Genius
ColorPage-Slim 1200 USB2.
2005-05-26 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/net.tex doc/sane.tex: Mention RPC codes explicitely and
explain what request and reply means. based on patch from
Johannes Berg <johannes@sipsolutions.net>.
Johannes Berg <johannes@sipsolutions.net>.
2005-05-25 Jochen Eisinger <jochen@penguin-breeder.org>
@@ -377,10 +377,10 @@
Mustek BearPaw 1200 CU Plus model 0x21b works now. Fixed
firmware and offset 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
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.
preview". By default for preview mode 8 bits/pixel are used.
Fixed indentation. Full scan really scans from y=0 on gt6816
scanners now.
* po/sane-backends.bg.po po/sane-backends.cs.po
@@ -400,7 +400,7 @@
2005-05-15 frank <sane at zago net>
* tools/Makefile.in: remove superflous libraries for sane-desc
* tools/Makefile.in: remove superflous libraries for sane-desc
* doc/descriptions/matsushita.desc: changed some scanner status from
good to minimal
* doc/descriptions/unsupported.desc: added a few Panasonic scanners.
@@ -417,7 +417,7 @@
2005-05-10 Gerhard Jaeger <gerhard@gjaeger.de>
* sanei/sanei_access.c: Added PATH_MAX, in case it's not defined
* sanei/sanei_access.c: Added PATH_MAX, in case it's not defined
by any header (i.e. OS/2).
2005-05-07 Mattias Ellert <mattias.ellert@tsl.uu.se>
@@ -443,7 +443,7 @@
* backend/qcam.c -indent -gnu, bugreport 300128 free (devlist) added,
DEBUG output added and some small fixes.
2005-05-05 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Dell 922.
@@ -451,16 +451,16 @@
doc/mustek/mustek.CHANGES: Added options to set the time after
which the lamp of the A3 Pro is shut off and to shut it off
immediately.
2005-05-02 Peter Fales <peter@fales-lorenz.net>
* backend/gphoto2.c: Fix core dump when no port is specified in
* backend/gphoto2.c: Fix core dump when no port is specified in
the gphoto2 config file. (bug #301552)
2005-04-29 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/sp15c.desc: Added ScanPartner 600C (bug
#301528).
#301528).
* doc/descriptions/unsupported.desc: Removed several Brother
scanner which are supported by the brother backend now.
* doc/descriptions-external/brother.desc: Fixed link.
@@ -499,12 +499,12 @@
* tools/hotplug/libsane.usermap: Fixed Minolta Scan Dual III entry
(bug #301512).
* doc/descriptions/mustek.desc: Added Mustek TwainScan II SP (bug
#301217).
#301217).
* doc/descriptions-external/viceo.desc: Added Primax Colorado 2200
USB.
* doc/descriptions/unsupported.desc: Added Canon PIXMA MP110.
* AUTHORS: Marked Kazuya Fukuda as active.
2005-04-23 Julien Blache <jb@jblache.org>
* LICENSE: Add an FAQ section.
@@ -545,7 +545,7 @@
split up printf command to remove warning ISO C89
patch for bugreport 300160, ranges for width and height are wrong
* doc/scanimage.man added text -B option buf size
2005-04-13 Mattias Ellert <mattias.ellert@tsl.uu.se>
* backend/hp-option.c: Add missing SANE_I18N
@@ -603,7 +603,7 @@
and to specify the group of the locking directory.
* include/sane/config.h.in: ENABLE_LOCKING has been added
by automake/autoconf.
* backend/Makefile.in: Added installation of
* backend/Makefile.in: Added installation of
$(localstatesanedir)/lock/sane, were the lockfile should go to.
Also added linking of sanei_access to the plustek backend.
* include/Makefile.in: Added sane/sanei_access.h.
@@ -638,7 +638,7 @@
* doc/descriptions/unsupported.desc
doc/descriptions-external/genesys.desc: Added and updated
various scanners.
various scanners.
2005-03-04 Gerard Klaver <gerard at gkall dot hobby dot nl>
@@ -717,7 +717,7 @@
* po/Makefile.in po/sane-backends.pl.po: Added Polish translation
(from Jerzy Szczudlowski
<jerzy-guest@users.alioth.debian.org>). See bug #301054.
2005-02-04 Gerhard Jaeger <gerhard@gjaeger.de>
* tools/hotplug/libsane.usermap: Added Epson CX6600 based on patch
@@ -728,7 +728,7 @@
* backend/niash_xfer.c:
* tools/hotplug/libsane.usermap:
added ID for Silitek-HP-ScanJet-3400c-Clone
2005-01-19 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
* backend/coolscan.c: added initilization of dev->scanning = SANE_FALSE
@@ -746,7 +746,7 @@
* doc/descriptions/unsupported.desc: Added UMAX Astraslim
6000. Added Trust SCSI Scan 19200 -Excellence Series-. Added
ColorPage-Vivid Pro II.
ColorPage-Vivid Pro II.
* tools/hotplug/libsane.usermap: Added Epson Stylus RX425 based on
bug report #301114.
* doc/sane-agfafocus.man doc/sane-artec.man: Fixed some macros
@@ -770,10 +770,10 @@
* doc/plustek/Plustek-USB.changes: Update.
* backend/plustek.c: Bumped build number. Copyright Update.
* backend/plustek-usbscan.c backend/plustek-usbshading.c:
Using now PhyDpi.y as selector for the motor MCLK setting.
* backend/plustek-usbscan.c backend/plustek-usbshading.c:
Using now PhyDpi.y as selector for the motor MCLK setting.
Copyright Update.
* backend/plustek-usbdevs.c:
* backend/plustek-usbdevs.c:
Tweaked motor settings for EPSON and CANON1200. Copyright Update.
* backend/plustek-*.[ch]: Copyright Update.
@@ -783,9 +783,9 @@
2005-01-09 Karl Heinz Kremer <khk@khk.net>
* backend/epson.c: "flaming hack to get USB scanners working without timeouts
* backend/epson.c: "flaming hack to get USB scanners working without timeouts
under linux" submitted by "Steve" (in comment to bug #300830)
* doc/descriptions/epson.desc, doc/sane-epson.man:
* doc/descriptions/epson.desc, doc/sane-epson.man:
Added SCSI version of GT-5000 to supported list.
2004-12-29 Julien Blache <jb@jblache.org>
@@ -798,8 +798,8 @@
* doc/descriptions-external/hpaio.desc join two lines so html
conversion possible
doc/descriptions-external/stv680.desc added two webcams with
different usb vid and pid
different usb vid and pid
2004-12-26 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added several scanners.
@@ -811,9 +811,9 @@
2004-12-15 Gerard Klaver <gerard at gkall dot hobby dot nl>
* doc/descriptions-external/hpaio.desc stv680.desc
* doc/descriptions-external/hpaio.desc stv680.desc
Info new external backends
2004-12-01 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c backend/snapscan-scsi.c backend/snapscan-options.c:
@@ -845,8 +845,8 @@
2004-12-01 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.h backend/snapscan.c backend/snapscan-scsi.c
backend/snapscan-options.c doc/descriptions/snapscan.desc:
* backend/snapscan.h backend/snapscan.c backend/snapscan-scsi.c
backend/snapscan-options.c doc/descriptions/snapscan.desc:
Added support for Epson Perfection 1270
2004-12-01 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -882,7 +882,7 @@
moving the HP 82xx to the avision backend
2004-11-19 Gerhard Jaeger <gerhard@gjaeger.de>
* backend/plustek.c backend/plustek-usb*: Major update, see
doc/plustek/Plustek-USB.changes. Esp. improved support for multiple
devices and autodetection.
@@ -910,16 +910,16 @@
2004-11-13 Frank Zago <fzago at austin dot rr dot com>
* include/sane/sanei_backend.h: Added compiler attribute __unused__
* include/sane/sanei_backend.h: Added compiler attribute __unused__
for unused variables/functions.
* backend/leo.c backend/teco3.c backend/matsushita.c
backend/sceptre.c backend/teco1.c: use __unused__
* sanei/sanei_wire.c sanei/sanei_pa4s2.c sanei/sanei_scsi.c:
* sanei/sanei_wire.c sanei/sanei_pa4s2.c sanei/sanei_scsi.c:
fixes for 64 bits platforms.
* backend/sp15c-scsi.h backend/sp15c.h backend/dc210.c backend/dc210.h:
fixes some warnings.
2004-11-13 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/v4l.c: 64 bit fix from Frank Zago <fzago at austin dot
ChangeLogs/ChangeLog-1.0.17
+68 -68
View File
@@ -13,8 +13,8 @@
2005-12-17 Karl Heinz Kremer <khk@khk.net>
* doc/descriptions/epson.desc: Added a few new scanners based on
messages to the sane-devel mailing list.
* doc/descriptions/epson.desc: Added a few new scanners based on
messages to the sane-devel mailing list.
2005-12-11 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -42,7 +42,7 @@
non-fatal warnings/error messages. Several fixes for avoiding
freezes/timeouts after cancelling a scan. Several fixes for
warming up of lamp. Decreased scan width of Plustek OpticPro
1248U.
1248U.
2005-12-08 Gerhard Jaeger <gerhard@gjaeger.de>
@@ -59,7 +59,7 @@
2005-12-07 Gerhard Jaeger <gerhard@gjaeger.de>
* sanei/sanei_acces.c: Fixed problem, when the device name contains
* sanei/sanei_acces.c: Fixed problem, when the device name contains
one or more path-separators. These characters are now converted.
The problem occurs on 2.4 based installations as well as on OpenBSD.
@@ -71,7 +71,7 @@
2005-12-06 Stephane Voltz <stefdev@modulonet.fr>
* backend/genesys_gl646.c: added AF init in powersave, fixed
long-standing bug related to a data read timeout between
long-standing bug related to a data read timeout between
distinct scanning sessions
2005-12-06 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -107,7 +107,7 @@
* backend/genesys.c backend/genesys_conv_hlp.c: Modified calling
parameters to stagger/line distance correction filter to better
describe its inner working.
* backend/genesys_devices.c: Slowed down motor timings for
* backend/genesys_devices.c: Slowed down motor timings for
LiDE 35/40/50/60. Removed untested message for LiDE 35/40/50/60.
* backend/genesys_gl646.c: Fixed bug for odd pixel count. Added
support for gray to lineart conversion.
@@ -148,12 +148,12 @@
2005-12-02 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan-sources.c: Another fix for lineart mode for the
* backend/snapscan-sources.c: Another fix for lineart mode for the
Epson 3490 @ 3200 DPI - this time tested
* backend/snapscan.c: Change version number to 1.4.50
2005-12-01 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added link for Corex Cardscan
500.
@@ -199,7 +199,7 @@
2005-11-25 Henning Meier-Geinitz <henning@meier-geinitz.de>
* po/sane-backends.da.po: Updated Danish translation (from Mogens
Jaeger <mogensjaeger@get2net.dk>).
Jaeger <mogensjaeger@get2net.dk>).
2005-11-25 Oliver Schwartz <Oliver.Schwartz@gmx.de>
@@ -267,35 +267,35 @@
2005-11-19 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_gl841.c backend/genesys_devices.c:
* backend/genesys_gl841.c backend/genesys_devices.c:
Added support for Canon LiDE 35/40/50
* backend/genesys.c backend/genesys_low.h
backend/genesys_gl646.c: Reworked data conversion
process to convert CIS data, added new slope
* backend/genesys.c backend/genesys_low.h
backend/genesys_gl646.c: Reworked data conversion
process to convert CIS data, added new slope
generation variant
* backend/genesys_conv.c backend/genesys_conv_hlp.c:
Moved conversion filter functions out of
* backend/genesys_conv.c backend/genesys_conv_hlp.c:
Moved conversion filter functions out of
backend/genesys.c
2005-11-18 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan-options.c: Disable 2400 DPI for
* backend/snapscan-options.c: Disable 2400 DPI for
Epson 3490, use 1600 DPI instead
2005-11-17 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-PARPORT.changes: Update.
* backend/plustek_pp.c backend/plustek-pp.h
* backend/plustek_pp.c backend/plustek-pp.h
backend/plustek-pp_ptdrv.c backend/plustek-pp_wrapper.c:
Fixed sizeof(long) issue for 64bit platforms, see
Fixed sizeof(long) issue for 64bit platforms, see
bugreport #302195.
* backend/plustek_pp.conf: Default config now only tries to
access parport using libieee1284.
2005-11-15 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c backend/snapscan-options.c
backend/snapscan-scsi.c: Enabled quality calibration for the
* backend/snapscan.c backend/snapscan-options.c
backend/snapscan-scsi.c: Enabled quality calibration for the
Epson 3490
* doc/descriptions/snapscan.desc: Changed status for Epson Perfection
3490 (good) and 3590 (basic)
@@ -316,7 +316,7 @@
concerning status of these backends.
2005-11-10 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c backend/snapscan-sources.c: Added
* backend/snapscan.c backend/snapscan-sources.c: Added
deinterlacing for Epson 3490
* backend/Makefile.in: added "snapscan" to FIRMWARE_DIRS
@@ -340,7 +340,7 @@
2005-11-02 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* sanei/sanei_usb.c: Fixed output of transfer buffer for
* sanei/sanei_usb.c: Fixed output of transfer buffer for
usb_read_bulk in OS/2.
* backend/snapscan.c backend/snapscan-scsi.c: Fixes for Benq 5000
* backend/snapscan-usb.c: Avoid recursive calls of usb_sense_handler
@@ -372,7 +372,7 @@
240H Easy Webscan Gold to artec_eplus48u backend.
* Makefile.in acinclude.m4 configure configure.in
backend/Makefile.in frontend/Makefile.in lib/Makefile.in
sanei/Makefile.in tools/Makefile.in:
sanei/Makefile.in tools/Makefile.in:
Run "makedepend" if it's available. This way "make" builds
backends correctly even if only included files (e.g. headers) are
changed. Don't be too verbose when running makedepend.
@@ -382,7 +382,7 @@
Remove any libsane.* links in /usr/local/lib/sane. Such links
are created by libtool. As they point to libsane-v4l.so,
scanimage -L doesn't find any scanner in case of ld.so
misconfigurations.
misconfigurations.
The install target is much quiter now and prints the libtool
message only once now.
* README.openbsd: Removed comment about broken library links.
@@ -392,7 +392,7 @@
* po/*.po: Updated po files, corrected/updated german translation.
* doc/plustek/Plustek-USB.changes: Update.
* backend/plustek.c backend/plustek.h: Added OPTION_SPEEDUP.
* backend/plustek-usbdevs.c: Changed high-speed setting for
* backend/plustek-usbdevs.c: Changed high-speed setting for
UMAX 3400, due to bugreport #302317.
Fixed CanoScan N650U settings (bugreport #302433).
@@ -409,7 +409,7 @@
2005-10-24 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c backend/snapscan-scsi.c backend/snapscan.h
backend/snapscan-options.c: Fix transparency range for Epson
backend/snapscan-options.c: Fix transparency range for Epson
2480/2580, fix preview for Epson 2580.
2005-10-24 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -420,17 +420,17 @@
2005-10-23 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c backend/snapscan-scsi.c: Fixes for buffer
size in high-res modes by Simon Munton, small changes to delay
size in high-res modes by Simon Munton, small changes to delay
code.
2005-10-23 Henning Meier-Geinitz <henning@meier-geinitz.de>
* tools/hotplug/libsane.usermap: Added Epson Stylus DX3850 (from
niels_kalle <niels_kalle@web.de>).
niels_kalle <niels_kalle@web.de>).
2005-10-22 Eddy De Greef <eddy_de_greef at tiscali dot be>
* backend/mustek_pp_cis.c: Decreased the maximum number of pixels
* backend/mustek_pp_cis.c: Decreased the maximum number of pixels
on a line for CIS scanners a bit to avoid border artifacts.
2005-10-22 Eddy De Greef <eddy_de_greef at tiscali dot be>
@@ -448,7 +448,7 @@
2005-10-20 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan-scsi.c: Fixes for 16 bit
* backend/snapscan-scsi.c: Fixes for 16 bit
quality calibration by Simon Munton
2005-10-18 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -463,7 +463,7 @@
* acinclude.m4 configure: Fixed check for libpthread functions.
* tools/hotplug/libsane.usermap: Added Brother MFC 210C (from
Benjamin Mirza <bm1607@yahoo.de>).
Benjamin Mirza <bm1607@yahoo.de>).
* doc/descriptions-external/epkowa.desc: Updated for iscan 1.17.0
(patch from Olaf Meeuwissen <olaf@member.fsf.org>). Bug #302183.
@@ -489,7 +489,7 @@
doc/descriptions/mustek_usb2.desc
doc/mustek_usb2/mustek_usb2.CHANGES:
Removed typedefs for DWORD, WORD and so on. Used int, unsigned
short, ... directly in the code.
short, ... directly in the code.
* AUTHORS configure configure.in backend/Makefile.in
backend/dll.conf backend/lexmark-x1100.c backend/lexmark.c
backend/lexmark.conf backend/lexmark.h doc/Makefile.in
@@ -505,7 +505,7 @@
* backend/Makefile.in doc/Makefile.in tools/Makefile.in: Make
"make dist" work again.
* acinclude.m4 configure include/sane/config.h.in: Check for
pthread_cancel() and pthread_testcancel().
pthread_cancel() and pthread_testcancel().
2005-10-15 Jochen Eisinger <jochen@penguin-breeder.org>
@@ -539,7 +539,7 @@
* doc/descriptions/unsupported.desc: Added HP ScanJet 3800c.
* frontend/scanimage.c: Use correct size for fgets. Patch from
Antoine Jacoutot <ajacoutot@lphp.org>.
Antoine Jacoutot <ajacoutot@lphp.org>.
2005-10-05 Mattias Ellert <mattias.ellert@tsl.uu.se>
@@ -554,7 +554,7 @@
backend/mustek_usb2_reflective.c backend/mustek_usb2_transparent.c
doc/Makefile.in doc/sane-mustek_usb2.man
doc/mustek_usb2/mustek_usb2.CHANGES
doc/mustek_usb2/mustek_usb2.TODO:
doc/mustek_usb2/mustek_usb2.TODO:
Added mustek_usb backend which supports the Mustek BearPaw 2448
TA Pro. Changes of the code before inclusion to CVS can be found
in doc/mustek_usb2/mustek_usb2.CHANGES.
@@ -578,7 +578,7 @@
* doc/plustek/Plustek-USB.changes: Update.
* backend/plustek.c: Bumped build number.
* backend/plustek-usbdevs.c backend/plustek-usb.h: Updated motor
settings for Canoscan LiDE25, thanks to Stephan February
settings for Canoscan LiDE25, thanks to Stephan February
<stephanf@singnet.com.sg> for providing these values.
2005-10-02 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -589,7 +589,7 @@
* AUTHORS: Fixed Rene Rebe's email address.
* doc/descriptions/unsupported.desc: Removed Epson Perfection 4180
(supported by epkowa backend).
2005-10-01 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions-external/mustek_a3p1.desc
@@ -606,7 +606,7 @@
2005-09-29 Eddy De Greef <eddy_de_greef at tiscali dot be>
* backend/mustek_pp_cis.c: Minor bug fix: wrong model name was
* backend/mustek_pp_cis.c: Minor bug fix: wrong model name was
reported for 1200CP+ driver.
2005-09-29 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -615,7 +615,7 @@
backend/gt68xx_generic.c backend/gt68xx_generic.h
backend/gt68xx_high.c backend/gt68xx_low.c backend/gt68xx_low.h
doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
doc/gt68xx/gt68xx.CHANGES doc/gt68xx/gt68xx.TODO:
doc/gt68xx/gt68xx.CHANGES doc/gt68xx/gt68xx.TODO:
Added support for Plustek OpticSlim M12 (untested). Based on patch
from Gerhard Jaeger <gerhard@gjaeger.de>. Fixed gt68xx homepage
links in man page. Changed minimum version of libusb to 0.1.8.
@@ -658,8 +658,8 @@
2005-09-25 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan-scsi.c: Removed debugging code for
Epson scanners until a working solution has been found.
* backend/snapscan-scsi.c: Removed debugging code for
Epson scanners until a working solution has been found.
2005-09-23 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -669,7 +669,7 @@
* configure configure.in: Added warning message that's printed
when libusb or its header file is not available.
* frontend/scanimage.c doc/scanimage.man: Added progress indicator
to scanimage (based on patch from Mario Goppold
to scanimage (based on patch from Mario Goppold
<mgoppold@tbz-pariv.de>). Updated copyright information, added
links to sane-devel mailing list.
* sanei/sanei_usb.c: Ignore EBUSY from usb_set_configuration. This
@@ -687,7 +687,7 @@
* backend/dc210.c backend/leo.c backend/matsushita.c
backend/sceptre.c backend/sp15c-scsi.h backend/sp15c.h
backend/teco1.c backend/teco2.c backend/teco3.c
include/sane/sanei_backend.h: Replaced __unused__ with
include/sane/sanei_backend.h: Replaced __unused__ with
__sane_unused__ to avoid a namespace conflict.
2005-09-18 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -695,9 +695,9 @@
* backend/gt68xx.c backend/gt68xx_high.c
doc/descriptions/gt68xx.descdoc/gt68xx/gt68xx.CHANGES
doc/gt68xx/gt68xx.TODO: Fixed segfault that may happen with
Mustek ScanExpress A3 USB.
Mustek ScanExpress A3 USB.
* doc/backend-writing.txt: Added some hints about number of
files.
files.
* backend/mustek.conf doc/sane-mustek.man
doc/descriptions/mustek.desc: Mustek Paragon 600 II EP
works. Mentioned "parport0".
@@ -720,7 +720,7 @@
2005-09-07 Oliver Schirrmeister <oschirr@abm.de>
* backend/fujitsu.c: enabled dropoutcolor for all fi-* scanners.
Applied patch from Mario Goppold: Bugfixes for the M3092DCd
Applied patch from Mario Goppold: Bugfixes for the M3092DCd
2005-09-05 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -730,13 +730,13 @@
2005-09-03 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.h backend/snapscan-scsi.c: (Hopefully) fixed
some debugging code for Epson scanners that only works after
firmware upload.
some debugging code for Epson scanners that only works after
firmware upload.
2005-09-02 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Epson Perfection 4490
Photo.
Photo.
* tools/hotplug/libsane.usermap: Added HP PSC 750.
2005-09-01 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -747,17 +747,17 @@
ColorPage Vivid 1200 X is reported to work. Genius ColorPage Vivid
4 XE seems to be the same as 4 X, it just doesn't have
buttons. Cleanup of .desc file. Fixed gain setting. Mustek
ScanExpress A3 USB 600 dpi color scanning works now.
ScanExpress A3 USB 600 dpi color scanning works now.
* tools/check-usb-chip.c: Added detection for SQ113 chip
(e.g. Mustek BearPaw 2448 TA Pro).
(e.g. Mustek BearPaw 2448 TA Pro).
2005-08-31 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Removed Mustek 1800 A3 Pro
(this is actually a P3600 A3 Pro).
(this is actually a P3600 A3 Pro).
* doc/descriptions-external/mustek_usb2.desc: Mustek BearPaw 2448
TA Pro has status "good" now.
2005-08-30 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Removed Mustek BearPaw 2448
@@ -817,7 +817,7 @@
doc/descriptions/unsupported.desc: Marked microtek2 backend as
unsupported. Changed link to point to old website directly. Listed
Microtek ScanMaker 9800XL as supported (bug #301515).
2005-08-21 Mattias Ellert <mattias.ellert@tsl.uu.se>
* ltmain.sh acinclude.am configure: Updated from libtool 1.5.18.
@@ -826,7 +826,7 @@
* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
backend/gt68xx_low.h doc/descriptions/gt68xx.desc
doc/gt68xx/gt68xx.CHANGES doc/gt68xx/gt68xx.TODO:
doc/gt68xx/gt68xx.CHANGES doc/gt68xx/gt68xx.TODO:
Increased number limit of scanners that can work with this
backend to 50. Added support for Genius ColorPage Vivid 1200 X
(untested).
@@ -880,7 +880,7 @@
* backend/snapscan-options.c: Removed //-style comment
2005-08-16 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Canon PIXMA MP780 and
Lexmark P6250.
* tools/sane-find-scanner.c: Don't print anything else but the
@@ -896,7 +896,7 @@
Removed direct dependence of sm3600 on libusb. Used sanei_usb
instead. Based on patch from Fran~is Revol <revol@free.fr>.
Updated documentation accordingly. Fixed compilation warnings.
2005-08-15 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c: Bumped version number
@@ -906,8 +906,8 @@
2005-08-15 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c backend/snapscan-options.c backend/snapscan-scsi.c
backend/snapscan.h doc/descriptions/snapscan.desc
backend/snapscan.conf: Added support for Epson Perfection 3490/3590
backend/snapscan.h doc/descriptions/snapscan.desc
backend/snapscan.conf: Added support for Epson Perfection 3490/3590
(thanks to Matt Judge).
2005-08-15 Gerhard Jaeger <gerhard@gjaeger.de>
@@ -920,17 +920,17 @@
* backend/plustek.c: Bumped version and build number.
Activated IPC between reader-process and parent.
* backend/plustek-usbio.c: usbio_DetectLM983x() now returns error if
register could not be red, usbio_ResetLM983x() checks for reg7
register could not be red, usbio_ResetLM983x() checks for reg7
value before writing.
* backend/plustek-usbhw.c: Added button support for Plustek/Genius
* backend/plustek-usbhw.c: Added button support for Plustek/Genius
devices. Changed behaviour of usb_IsScannerReady().
Added special misc I/O setup for CIS devices (usb_ResetRegisters).
* backend/plustek-usb.c: Minor fix for startup reset.
Removed unnecessary calls to usbio_ResetLM983x().
* backend/plustek-usbshading.c: Readded kCIS670 to add 5% extra to
* backend/plustek-usbshading.c: Readded kCIS670 to add 5% extra to
LiDE20 fine calibration.
* backend/plustek-usbcal.c: Tried to use the settings from SANE-1.0.13.
Added _TWEAK_GAIN to allow increasing GAIN during lamp coarse
Added _TWEAK_GAIN to allow increasing GAIN during lamp coarse
calibration. Added call to speedtest function.
2005-08-14 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -965,7 +965,7 @@
included).
* configure configure.in: Moved CPPFLAGS definition down to avoid
problems with libtool tests for -fPIC.
2005-08-10 Gerhard Jaeger <gerhard@gjaeger.de>
* backend/plustek_pp.c: Bumped build number.
@@ -975,19 +975,19 @@
* doc/plustek/Plustek-PARPORT.changes: Update.
2005-08-09 Henning Meier-Geinitz <henning@meier-geinitz.de>
* sanei/sanei_usb.c: Minor fixes for usbcalls interface (patch
from Paul Smedley <paul@smedley.info>).
* doc/descriptions/unsupported.desc: Added Hewlett-Packard Scanjet
4370.
4370.
2005-08-08 Gerhard Jaeger <gerhard@gjaeger.de>
* acinclude.m4 configure: Locking feature will be disabled on OS/2
per default (according to Paul Smedley <paul@smedley.info>).
* doc/plustek/Plustek-USB.changes: Update.
* backend/plustek.c: Bumped build number.
* doc/plustek/Plustek-USB.txt doc/descriptions/plustek.desc
* doc/plustek/Plustek-USB.txt doc/descriptions/plustek.desc
doc/sane-plustek.man backend/plustek-usb.c backend/plustek-usbdevs.c:
Added support for CanoScan LiDE25.
ChangeLogs/ChangeLog-1.0.18
+32 -32
View File
@@ -6,7 +6,7 @@
2006-07-02 Gerhard Jaeger <gerhard@gjaeger.de>
* backend/plustek.c: Fixed the fix (problem when trying to
* backend/plustek.c: Fixed the fix (problem when trying to
select bit-depth).
2006-07-01 Wittawat Yamwong <wittawat@web.de>
@@ -23,7 +23,7 @@
* NEWS: Added dell1600n_net backend.
* doc/releases.txt: Typo fix.
* aclocal.m4 configure configure.in include/sane/config.h.in:
* aclocal.m4 configure configure.in include/sane/config.h.in:
Disabled compilation warnings for release.
---- CODE FREEZE FOR SANE-BACKENDS 1.0.18 ---
@@ -40,11 +40,11 @@
2006-06-22 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/epson.desc: Fixed USB id of CX6600 (patch from
Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>).
* doc/descriptions-external/epkowa.desc: Updated (patch from
Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>).
Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>).
* doc/descriptions-external/epkowa.desc: Updated (patch from
Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>).
* doc/descriptions/unsupported.desc: Added Xerox WorkCentre
PE120i.
PE120i.
2006-06-19 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -66,7 +66,7 @@
2006-06-14 Jon Chambers <jon@jon.demon.co.uk>
* backend/dell1600n_net.c: working backend added
2006-06-13 m. allan noah <anoah AT pfeiffer DOT edu>
* backend/fujitsu.[ch]: update to v1.0.31, add 5220c usb id,
@@ -75,7 +75,7 @@
* doc/descriptions/fujitsu.desc: usb id and version update
2006-06-12 Jochen Eisinger <jochen@penguin-breeder.org>
* doc/descriptions/mustek_pp.desc: Added Micromaxx MM-0851
---- FEATURE FREEZE FOR SANE 1.0.18 ---
@@ -85,16 +85,16 @@
* backend/coolscan2.c doc/descriptions/coolscan2.desc: Added
(minimal) support for Nikon LS 50 ED, Coolscan V ED and
(probably) Super Coolscan LS-5000 ED (patch from Giuseppe Sacco
<giuseppe@eppesuigoccas.homedns.org>).
<giuseppe@eppesuigoccas.homedns.org>).
* backend/pixma.h: Fixed compilation problem on *BSD (ENODATA not
defined).
defined).
* doc/descriptions/unsupported.desc: Added Canon 9950. Removed
Epson 4490 (supported by epkowa). Removed Nikon scanners
(supported by coolscan2 backend). Updated PLANon DocuPen R700.
2006-06-11 Eddy De Greef <eddy_de_greef at scarlet dot be>
* AUTHORS backend/mustek_pp_cis.c backend/mustek_pp_cis.h
* AUTHORS backend/mustek_pp_cis.c backend/mustek_pp_cis.h
doc/sane-mustek_pp.man: e-mail address update.
2006-06-11 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -296,7 +296,7 @@
* AUTHORS: added Wittawat Yamwong
* configure configure.in doc/Makefile.in doc/sane.man
doc/descriptions/pixma.desc backend/Makefile.in
doc/descriptions/pixma.desc backend/Makefile.in
backend/dll.conf.in backend/pixma*.[ch]: added pixma backend
* doc/descriptions-external/pixma.desc: removed because the backend
is now a part of sane-backends.
@@ -318,13 +318,13 @@
2006-05-21 m. allan noah <anoah AT pfeiffer DOT edu>
* backend/fujitsu.c backend/fujitsu.conf.in
* backend/fujitsu.c backend/fujitsu.conf.in
doc/descriptions/fujitsu.desc: added usb ids for fi-5110EOX
2006-05-21 Henning Meier-Geinitz <henning@meier-geinitz.de>
* README.linux: Updated concerning USB permissions (really, this
time).
time).
* doc/descriptions/unsupported.desc: Removed models that are now
in pixma.desc. Updated comment for Plustek OpticPro S24.
* doc/descriptions-external/hp_rts88xx.desc: Added reason for not
@@ -342,7 +342,7 @@
2006-05-18 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions-external/pixma.desc: Added some models (from
Wittawat Yamwong <wy-sane-devel@arcor.de>).
Wittawat Yamwong <wy-sane-devel@arcor.de>).
2006-05-14 m. allan noah <anoah AT pfeiffer DOT edu>
@@ -350,7 +350,7 @@
do_cmd() - simplify timeout handling
* backend/fujitsu-scsi.h: increase default timeoutes
2006-05-15 Stephane Voltz <stefdev@modulonet.fr>
2006-05-15 Stephane Voltz <stefdev@modulonet.fr>
* backend/genesys_devices.c backend/genesys_gl646.c: tuned HP 2300
geometry description and added a safeguard against failed origin
@@ -381,7 +381,7 @@
* doc/descriptions/lexmark.desc: X1150 is reported to work.
* doc/descriptions-external/brother.desc: MFC-3820CN is reported
to work.
to work.
2006-04-27 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -394,7 +394,7 @@
* backend/genesys_devices.c: Increase length of acceleration
slopes for Canon LiDE 35/40/50/60
2006-04-21 Stephane Voltz <stefdev@modulonet.fr>
2006-04-21 Stephane Voltz <stefdev@modulonet.fr>
* backend/genesys.c: add workraound with issue related
to asic reset and data scan amount
@@ -406,7 +406,7 @@
explanations are given once at the top. Don't repeat options
that aren't changed anyway.
* doc/descriptions/unsupported.desc: Added Microtek Scanmaker
3880.
3880.
2006-04-18 Giuseppe Sacco <eppesuig@debian.org>
* Updated italian translation
@@ -418,7 +418,7 @@
* backend/genesys_conv_hlp.c: Fix interpolation code to emit all
pixels of a line.
* doc/descriptions/unsupported.desc: Added missing scanners from
libsane.usermap.
libsane.usermap.
2006-04-18 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -428,11 +428,11 @@
ids. Minor cleanup.
* doc/descriptions/avision.desc: Used avision-desc.sh to update
the .desc file to current SANE CVS avision.c code. Added USB
ids.
ids.
* doc/descriptions/plustek.desc: Added USB ids. Splitted some
entries which have two different USB ids. Clarified comment about
UMAX 3400.
* tools/hotplug/libsane.usermap: Removed. Will be created
UMAX 3400.
* tools/hotplug/libsane.usermap: Removed. Will be created
automatically by sane-desc.
* tools/Makefile.in: Create libsane.usermap (for hotplug),
libsane.db (for hotplug-ng) and libsane.rules (for udev)
@@ -461,7 +461,7 @@
MP730.
* doc/sane-mustek_usb2.man: Removed description of non-existing
configuration file.
2006-04-12 Julien Blache <jb@jblache.org>
* tools/sane-desc.c: Fix/optimize udev rules; tests on the same
line are ANDed together, not ORed together, causing the rules to
@@ -490,7 +490,7 @@
2006-03-29 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/sp15c.c: Fixed ADF support. Patch from Andreas Degert
<ad@papyrus-gmbh.de>.
<ad@papyrus-gmbh.de>.
* doc/descriptions-external/cs3200f.desc: Listed new cs3200f
backend for Canon 3200F.
* doc/descriptions/unsupported.desc: Added Canon PIXMA760, Tevion
@@ -499,7 +499,7 @@
2006-03-27 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys.c backend/genesys.h backend/genesys_low.h
* backend/genesys.c backend/genesys.h backend/genesys_low.h
backend/genesys_conv.c backend/genesys_gl841.c: Added extended
option "Threshold" for lineart mode(Thanks to Laurent Charpentier).
@@ -509,10 +509,10 @@
2006-03-24 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Iris Iriscan and Xerox
Documate 510.
Documate 510.
2006-03-21 Julien Blache <jb@jblache.org>
* doc/*.man: More spelling fixes from A. Costa (through Debian).
2006-02-02 Oliver Schwartz <Oliver.Schwartz@gmx.de>
@@ -521,7 +521,7 @@
firmware is not yet loaded
2006-03-18 Julien Blache <jb@jblache.org>
* doc/sane-apple.man: Applied patch from A Costa (through Debian);
english/spelling fixes for sane-apple(5).
@@ -530,7 +530,7 @@
* doc/descriptions/unsupported.desc: Added Microtek ScanMaker 4850
II and Plustek OpticPro ST 64+.
2006-03-12 Stephane Voltz <stefdev@modulonet.fr>
2006-03-12 Stephane Voltz <stefdev@modulonet.fr>
* backend/genesys_gl646.c: removed now unneeded #ifdef in
gl646_send_gamma_table.
@@ -552,7 +552,7 @@
2006-03-09 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys.c backend/genesys_low.h: Removed little endian
* backend/genesys.c backend/genesys_low.h: Removed little endian
conversions in slope table creation functions
* backend/genesys_gl646.c backend/genesys_gl841.c: Added little
endian conversions to gl*_send_slope_table functions
@@ -573,7 +573,7 @@
SCX-4100 (bug #303166).
* doc/descriptions/unsupported.desc: Added Brother MFC 9600, Canon
PIXMA MP450, and Plustek ScanCopy 115.
2006-02-16 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-PARPORT.changes: Update.
ChangeLogs/ChangeLog-1.0.19
+23 -23
View File
@@ -102,7 +102,7 @@
2008-01-16 m. allan noah <kitno455 a t gmail d o t com>
* po/sane-backends.fr.po: updated translation from Yann E. MORIN
* backend/fujitsu.c, backend/fujitsu.conf.in,
* backend/fujitsu.c, backend/fujitsu.conf.in,
doc/descriptions/fujitsu.desc: add usb id for S500M
2008-01-16 Jonathan Bravo Lopez <jkdsoft@gmail.com>
@@ -251,7 +251,7 @@
added support for Perfection 4990 (Claus Boje).
2007-11-17 m. allan noah <kitno455 a t gmail d o t com>
* backend/fujitsu.c, backend/fujitsu.conf.in,
* backend/fujitsu.c, backend/fujitsu.conf.in,
doc/descriptions/fujitsu.desc: add usb id for S510
2007-11-17 Rene Rebe <rene@exactcode.de>
@@ -276,7 +276,7 @@
* backend/plustek-usb.[ch] backend/plustek-usbcal.c
backend/plustek-usbdevs.c backend/plustek-usbshading.c
backend/plustek.[ch] backend/plustek.conf.in:
Tweaked TravelScan464 settings. Added possibility to disable
Tweaked TravelScan464 settings. Added possibility to disable
dark-calibration with lamp on (touches devices like CanoScan1220 etc.)
Use attribute packed for data access structs
@@ -302,7 +302,7 @@
2007-11-11 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys.c, backend/genesys_gl646.c,
backend/genesys_gl841.c, backend/genesys_low.h: change
backend/genesys_gl841.c, backend/genesys_low.h: change
bulk_write_register to take number of registers instead of
byte size of register set
@@ -335,7 +335,7 @@
* doc/descriptions/unsupported.desc: Updated some entries
* backend/plustek-usb.c backend/plustek-usbimg.c backend/plustek-usbmap.c
backend/plustek-usbscan.c backend/plustek-usbshading.c: Fixed copyright
* backend/plustek-usb.h backend/plustek-usbdevs.c
* backend/plustek-usb.h backend/plustek-usbdevs.c
doc/descriptions/plustek.desc: Added support for TravelScan464
2007-10-28 Julien Blache <jb@jblache.org>
@@ -370,9 +370,9 @@
sizeof(Genesys_Register_Set)
2007-10-25 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_gl841.c: One more instance of
* backend/genesys_gl841.c: One more instance of
sizeof(Genesys_Register_Set) vs 2
* backend/genesys.c: Add check for small register set in
* backend/genesys.c: Add check for small register set in
sanei_genesys_get_address
2007-10-24 Julien Blache <jb@jblache.org>
@@ -550,7 +550,7 @@
2007-07-15 m. allan noah <kitno455 a t gmail d o t com>
* doc/descriptions/fujitsu.desc, doc/sane-fujitsu.man:
* doc/descriptions/fujitsu.desc, doc/sane-fujitsu.man:
update website and fi-60F status
* Authors, backend/dll.conf.in: added cardscan backend
@@ -628,7 +628,7 @@
* backend/hp5590.c: Do not localize option names
2007-04-29 Ilia Sotnikov <hostcc@gmail.com>
* backend/hp5590_low.c: don't use libusb structs directly, define
necessary of them by ourselves ('struct usb_ctrl_setup' -> 'struct
usb_in_usb_ctrl_setup')
@@ -756,7 +756,7 @@
2007-02-11 Henning Meier-Geinitz <henning@meier-geinitz.de>
* po/sane-backends.pl.po: Polish translation fix (from Jakub
Bogusz <qboosh at pld-linux.org>, bug #304410).
Bogusz <qboosh at pld-linux.org>, bug #304410).
2007-02-07 Gerhard Jaeger <gerhard@gjaeger.de>
@@ -767,7 +767,7 @@
* backend/gt68xx.c backend/gt68xx_devices.c
doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Added
.conf entry for Pluste OpticPro S12 and S24. Updated .desc
file.
file.
* doc/descriptions/unsupported.desc: Added UMAX Astra 2850. Added
Canon Imagerunner series.
@@ -789,7 +789,7 @@
backend/fujitsu.c: updated email address
* backend/fujitsu-scsi.h, backend/fujitsu.[ch]: update to v1.0.44,
set SANE_CAP_HARD_SELECT on all buttons/sensors.
disable sending gamma LUT, quality errors reported.
disable sending gamma LUT, quality errors reported.
support MS overscan.
clamp the scan area to the pagesize on ADF.
* doc/descriptions/fujitsu.desc: version number update
@@ -854,7 +854,7 @@
* epson2: removed calls to alloca(), code reorganization
fixed a bug with request_extended_status (reply
length is 33 on older scanners).
length is 33 on older scanners).
* include/.cvsignore: added two more entries
2006-12-10 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
@@ -870,7 +870,7 @@
2006-12-07 Alessandro Zummo <a.zummo@towertech.it>
* epson2: reordered includes, replaced __FUNCTION__,
use the new byteorder macros
use the new byteorder macros
* moved acbyteorder.m4 to m4/byteorder.m4,
added m4/stdint.m4
@@ -903,7 +903,7 @@
2006-11-22 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-USB.changes: update.
* backend/plustek.c: bumped build number, fixed option
* backend/plustek.c: bumped build number, fixed option
descriptors, see bug #303786.
2006-11-22 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -930,7 +930,7 @@
(noticed by Jaroslaw Gorny) (bug #303962).
* po/sane-backends.es.po: Updated (from Jonathan Bravo Lopez
<jkdsoft at gmail.com>).
* doc/descriptions-external/hp3900.desc
* doc/descriptions-external/hp3900.desc
doc/descriptions-external/samsung.desc: Updated based on
sane-devel information.
* doc/descriptions/unsupported.desc: Added Canon Canoscan 4400F,
@@ -943,14 +943,14 @@
Scanjet 4370 to "minimal" (bug #303839).
* doc/scanimage.man frontend/scanimage.c: Added examples on how to
set the scan area in the manual page (bug #303802). Mention how
to separate parameters from options in --help and manpage (bug
to separate parameters from options in --help and manpage (bug
#303819).
* doc/descriptions/unsupported.desc: Added EDT BizCardReader
900C. Moved Genius ColorPage-SF600 to gt68xx.desc. Minor
updates.
* backend/gt68xx.c backend/gt68xx_devices.c
doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Added
Support for Genius Colorpage SF600.
Support for Genius Colorpage SF600.
2006-09-24 Giuseppe Sacco <eppesuig@debian.org>
@@ -990,7 +990,7 @@
* doc/plustek/Plustek-PARPORT.changes: update.
* backend/plustek-pp.h backend/plustek-pp_ptdrv.c backend/plustek_pp.c:
fixed "not homing" problem, the sensor did not return when
fixed "not homing" problem, the sensor did not return when
the driver gets the _IOCTL_STOP command
fixed compilation issue for kernels > 2.6.15
fixed compiler warning conditions
@@ -1017,7 +1017,7 @@
fix line correction (color alignment) for MP760
* doc/sane-pixma.man: update
* doc/descriptions/pixma.desc: add MP360,MP530 and MP800R product ID
* doc/descriptions/unsupported.desc: remove Smartbase MP360 (supported
* doc/descriptions/unsupported.desc: remove Smartbase MP360 (supported
by pixma backend)
2006-08-26 m. allan noah <anoah AT pfeiffer DOT edu>
@@ -1053,7 +1053,7 @@
* backend/dell1600n_net.c: update for dell1600n_net.conf + reduce memory footprint
* backend/dell1600n_net.conf.in: added
* backend/dell1600n_net.c: update for dell1600n_net.conf.in
* backend/dell1600n_net.c: update for dell1600n_net.conf.in
2006-08-11 Gerhard Jaeger <gerhard@gjaeger.de>
@@ -1080,7 +1080,7 @@
2006-08-06 Stephane Voltz <stefdev@modulonet.fr>
* backend/genesys_gl646.c backend/genesys.c: fix y scan area offset
detection for HP2300, one more fixe related to bug #303681.
detection for HP2300, one more fixe related to bug #303681.
2006-08-01 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -1144,7 +1144,7 @@
2006-07-04 m. allan noah <anoah AT pfeiffer DOT edu>
* backend/fujitsu.[ch] backend/fujitsu-scsi.h:
* backend/fujitsu.[ch] backend/fujitsu-scsi.h:
update to v1.0.34, add S500 usb id, get more inq and vpd data,
allow background color setting for some scanners
* doc/descriptions/fujitsu.desc: version number update
ChangeLogs/ChangeLog-1.0.2
+23 -23
View File
@@ -33,7 +33,7 @@
* configure.in: Don't use -ansi and -pedantic unless
--enable-warnings is used. Warnings are now disabled by default
to prepare for the next release.
2000-02-24 Petter Reinholdtsen <pere@td.org.uit.no>
* tools/sane-desc.el: In backend web page, packends not included
@@ -71,7 +71,7 @@
2000-02-19 Karl Heinz Kremer <khk@khk.net>
* backend/epson.*: Updated desc file with new version number and
* backend/epson.*: Updated desc file with new version number and
some more supported scanners.
Removed OPT_PREVIEW_RESOLUTION so that the frontend can handle
the preview resolution.
@@ -115,8 +115,8 @@
2000-02-18 Abel Deuring <a.deuring@satzbau-gmbh.de>
* sharp.c / sharp.h: Options for resolution now conform to
the Sane API; fixed and initialisation bug. Updated backend
version number in sharp.desc.
the Sane API; fixed and initialisation bug. Updated backend
version number in sharp.desc.
2000-02-18 Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
* updated umax backend to 1.0 build 17
@@ -132,7 +132,7 @@
* backend/m3096g-scsi.h backend/sp15c-scsi.h: Make lint_catcher
static to avoid link problems with duplicate symbols.
2000-02-13 Petter Reinholdtsen <pere@td.org.uit.no>
* README.unixware2: Information from Wolfgang Rapp on how to build
@@ -140,7 +140,7 @@
* ltconfig ltmain.sh: Upgraded to libtool 1.3.4 and added Oliver
Rauch's soname patch.
* backend/hp-accessor.c backend/hp-device.c backend/hp-handle.c
backend/hp-hpmem.c backend/hp-option.c backend/hp-option.h
backend/hp-scl.c backend/hp-scsi.h backend/hp.c backend/hp.desc
@@ -162,8 +162,8 @@
* backend/artec.desc: updated backend version information.
2000-02-11 Karl Heinz Kremer <khk@khk.net>
* backend/epson.c - Fixed default scan source when option equipment
is installed. The default is now always "Flatbed".
* backend/epson.c - Fixed default scan source when option equipment
is installed. The default is now always "Flatbed".
2000-02-08 Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
@@ -215,7 +215,7 @@
2000-02-05 Rene Rebe <rene.rebe@myokay.net>
* backedn/avision.? only minor updates and the new home-page
url ...
2000-02-05 Abel Deuring <a.deuring@satzbau-gmbh.de>
* fixed wrong buffer size handling for old Linux SG drivers
in sanei_scsi.c
@@ -234,7 +234,7 @@
2000-02-01 Karl Heinz Kremer <khk@khk.net>
* backend/epson.[ch] More changes in the attach function to
recognize USB scanners again.
* doc/sane-epson.man More updates to the man page.
* doc/sane-epson.man More updates to the man page.
2000-01-29 Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
@@ -265,7 +265,7 @@
* backend/avision.c fixed to compile on HP/UX
* backend/avision.desc fixed typo
* AUTHORS changed my eMail address
2000-01-30 Petter Reinholdtsen <pere@td.org.uit.no>
* backend/dll.c backend/dll.aliases doc/sane-dll.man: Aliased and
@@ -332,7 +332,7 @@
* include/sane/sanei_debug.h: Add fflush() after fprintf() in
DBG macro.
* AUTHORS backend/Makefile.in backend/m3096g.h backend/m3096g.c
backend/m3096g-scsi.h backend/m3096g.desc backend/m3096g.conf
backend/sp15c.h backend/sp15c.c backend/sp15c-scsi.h
@@ -344,7 +344,7 @@
2000-01-24 Abel Deuring <a.deuring@satzbau-gmbh.de>
* backend/sharp.c, backend/sharp.h: update to version 0.30
* backend/sharp.c, backend/sharp.h: update to version 0.30
(sorry, forgot to make this note some days earlier)
2000-01-24 Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
@@ -356,7 +356,7 @@
* ChangeLog: updated (oversaw last time, sorry)
* backend/avision.c: fixed some compiling warnings
2000-01-21 Petter Reinholdtsen <pere@td.org.uit.no>
* sanei/sanei_scsi.c: Bugfix: Added return type for dummy
@@ -398,10 +398,10 @@
2000-01-09 Karl Heinz Kremer <khk@khk.net>
* backend/epson.* updated. This is a new backend still based
on the origial Sane 1.0.1 version, but with lots of work
done: Support for ADF/TPU, more function levels (up to B9
and initial work for F5), parallel scanner support and initial
* backend/epson.* updated. This is a new backend still based
on the origial Sane 1.0.1 version, but with lots of work
done: Support for ADF/TPU, more function levels (up to B9
and initial work for F5), parallel scanner support and initial
support for USB scanners (don't use this yet, it still needs
a lot of work to be functional and usable).
@@ -515,8 +515,8 @@
- PhotoScanner: Allow scanning of slides/negatives only at
multiple of 300 dpi. This fixes problem with preview which
scanned at arbitrary resolutions.
- (by Marian Szebenyi): close pipe (coredump on Digital UNIX)
- (by Marian Szebenyi): close pipe (coredump on Digital UNIX)
* backend/Makefile.in: Correct install target to also work on
platforms where dll endings isn't .so (like HP/UX). Extract
endings from libsane-dll.la.
@@ -527,7 +527,7 @@
Generic support in the OS kernel. If NOT present it tells the user
they may need SG drivers. Patch from Nick Lamb
<njl98r@ecs.soton.ac.uk>.
* sanei/sanei_scsi.c [sanei_scsi_cmd sanei_scsi_open]: Digital
UNIX 4.0D patches from Marian Szebenyi <dms35@cornell.edu>.
@@ -537,7 +537,7 @@
* acinclude.m4 configure.in: Separate GTK_LIBS into LIBS and
LDFLAGS to get the X programs to link on HP/UX.
1999-08-12 Petter Reinholdtsen <pere@td.org.uit.no>
* aclocal.m4 configure.in configure: Generate configure and
@@ -553,7 +553,7 @@
* config.guess config.sub: Updated to latest versions from FSF.
Better support for BeOS, WinNT and others.
1999-08-09 Petter Reinholdtsen <pere@td.org.uit.no>
* Started CVS branch DEVEL_1_9.
ChangeLogs/ChangeLog-1.0.20
+100 -100
View File
@@ -1,7 +1,7 @@
2009-05-03 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* Makefile.in, aclocal.m4, configure, */Makefile.in: Regenerated
* Makefile.in, aclocal.m4, configure, */Makefile.in: Regenerated
with newer automake.
* backend/Makefile.am, tools/sane-config.in: Add missing
* backend/Makefile.am, tools/sane-config.in: Add missing
$GPHOTO2_LDFLAGS so library can be found.
* tools/Makefile.am: Add mising $SCSI_LIBS to sane-find-scanner.
@@ -56,7 +56,7 @@
2009-04-27 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_gl646.c backend/genesys_devices.c:
shading calibration fixes for HP2300
shading calibration fixes for HP2300
2009-04-25 Alessandro Zummo <a.zummo@towertech.it>
* backend/epson2.c: fixed TPU warmup retry
@@ -71,11 +71,11 @@
2009-04-22 m. allan noah <kitno455 a t gmail d o t com>
* include/sane/sane.h: convert new frame and status to #define
2009-04-21 Nicolas Martin <nicols-guest at users.alioth.debian.org>
2009-04-21 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* doc/sane-pixma.man, doc/descriptions/pixma.desc,
backand/pixma_mp150.c:
Updated documentation for Pixma MP240, reported to work fine by Nik.
2009-04-21 Alex Belkin <abc@telekom.ru>
* backend/xerox_mfp.c: update version number.
@@ -90,10 +90,10 @@
2009-04-20 Alessandro Zummo <a.zummo@towertech.it>
* backend/coolscan3.c: temporarily disable infrared.
2009-04-17 Nicolas Martin <nicols-guest at users.alioth.debian.org>
2009-04-17 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* doc/sane-pixma.man, doc/descriptions/pixma.desc:
Updated documentation for Pixma MP540, reported to work fine by Rogge.
2009-04-17 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys.c, backend/genesys_gl646.c,
backend/genesys_gl841.c, backend/genesys_low.h: Always do shading
@@ -145,22 +145,22 @@
backend/sane_strstatus.c: STATUS_HW_LOCKED & STATUS_WARMING_UP
* doc/releases.txt: minor updates for new build system
2009-04-07 Nicolas Martin <nicols-guest at users.alioth.debian.org>
2009-04-07 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* doc/sane-pixma.man, doc/descriptions/pixma.desc:
Updated documentation for i-SENSYS MF4018 support.
2009-04-07 Julien Blache <jb@jblache.org>
* doc/descriptions-external/epkowa.desc: update for iScan 2.19.0,
from Olaf Meeuwissen.
2009-04-05 Nicolas Martin <nicols-guest at users.alioth.debian.org>
2009-04-05 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_io.h, backend/pixma_io_sanei.c, doc/sane-pixma.man:
Increased timeouts for read bulk and write bulk operations to 10s
Changed minimum timeout for interrupt read to 100ms
For MAC OS X : added a wrapper to sanei_usb_read_int as darwin libusb
does not handle timeouts in interrupt reads. This disables button scan
for MAC OS X, updated man page with this info.
* backend/pixma_mp150.c:
* backend/pixma_mp150.c:
Added 2 new Canon Pixma models but usb pid/vid yet unknown.
2009-04-05 m. allan noah <kitno455 a t gmail d o t com>
@@ -181,7 +181,7 @@
- silenced some debug statements during scanner detections
- increased timeouts to 20 seconds as 10 seconds is apparently
- not enough for the combination of a Mac and an MX850.
2009-03-21 Alex Belkin <abc@telekom.ru>
* backend/xerox_mfp.conf.in: add Xerox Phaser 6110MFP
* backend/xerox_mfp.c: compatibility with scanners w/o feeder.
@@ -200,7 +200,7 @@
2009-03-25 m. allan noah <kitno455 a t gmail d o t com>
* backend/canon_dr.[ch]: backend v22
- add deinterlacing code for DR-2510C in duplex and color
- add deinterlacing code for DR-2510C in duplex and color
2009-03-25 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys.c, backend/genesys_gl646.c,
@@ -263,7 +263,7 @@
- remove unused temp file code
2009-03-20 m. allan noah <kitno455 a t gmail d o t com>
* backend/hpljm1005.c: use private function instead of round()
* backend/hpljm1005.c: use private function instead of round()
2009-03-19 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_devices.c, backend/genesys.conf.in:
@@ -287,7 +287,7 @@
Mobile Scanner (from Kelly Price)
2009-03-13 m. allan noah <kitno455 a t gmail d o t com>
* frontend/scanimage.c, doc/scanimage.man: make -B (buffer-size)
* frontend/scanimage.c, doc/scanimage.man: make -B (buffer-size)
selectable, and make long name consistent. (#309672 by Johannes Berg)
2009-03-13 m. allan noah <kitno455 a t gmail d o t com>
@@ -315,7 +315,7 @@
- Use hstrerror (h_errno) instead of strerror(errno) on gethostbyname()
errors
2009-03-12 Nicolas Martin <nicols-guest at users.alioth.debian.org>
2009-03-12 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* doc/sane-pixma.man, doc/descriptions/pixma.desc:
Added ImageClass MF4010 support in pixma backend docs.
* backend/pixma_imageclass.c:
@@ -346,7 +346,7 @@
with xsane preview
2009-03-06 m. allan noah <kitno455 a t gmail d o t com>
* backend/canon_dr.c, backend/canon_dr.conf.in,
* backend/canon_dr.c, backend/canon_dr.conf.in,
doc/descriptions/canon_dr.desc: backend version 13
- new vendor ID for recent machines
- add usb ids for several new machines
@@ -402,7 +402,7 @@
2009-02-28 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys.conf.in, backend/genesys_devices.c,
backend/genesys_gl841.c, backend/genesys_low.h: Add support for
backend/genesys_gl841.c, backend/genesys_low.h: Add support for
Ambir/Syscan DocketPORT 665
* backend/genesys.conf.in, backend/genesys_devices.c,
backend/genesys_low.h: Add support for Visioneer Roadwarrior
@@ -455,8 +455,8 @@
doc/sane-epjitsu.man: add S300M usb ID's
2009-02-23 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_devices.c, backend/genesys_gl841.c,
backend/genesys_low.h: Add post_scan and eject_feed to struct
* backend/genesys_devices.c, backend/genesys_gl841.c,
backend/genesys_low.h: Add post_scan and eject_feed to struct
Genesys_Model
* backend/genesys.c, backend/genesys_gl646.c,
backend/genesys_gl841.c: Move sanei_genesys_{start,stop}_motor into
@@ -519,7 +519,7 @@
under sane/ directory when converted to automake.
* doc/Makefile.am: Cleanup. Use automake's built in support to
install docs within subdirectories.
* Makefile.am, testsuite: Convert testsuite to automake. Waiting
* Makefile.am, testsuite: Convert testsuite to automake. Waiting
for test backend bugfix before enabling this to run during "distcheck".
2009-02-18 Julien Blache <jb@jblache.org>
@@ -531,7 +531,7 @@
actually works.
2009-02-14 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* configure.in, doc/Makefile.am, frontend/Makefile.am,
* configure.in, doc/Makefile.am, frontend/Makefile.am,
include/Makefile.am, sanei/Makefile.am, tools/Makefile.am:
convert frontend, include, and sanei directories to use
automake. Only reference libsanei.la now. Use am_conditional
@@ -564,13 +564,13 @@
2009-02-06 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* configure.in, backend/Makefile.am: Add back in support for
optionally linking in sanei_jpeg.lo under backend directory;
optionally linking in sanei_jpeg.lo under backend directory;
but using configure and not with GNU make extensions.
Move back to libtool's -version-info instead of -version-number
because the later has known bugs on platforms such as OS/2.
2009-02-04 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* configure.in, acinclude.ac: Cleanup autoconf 2.63 warnings.
* configure.in, acinclude.ac: Cleanup autoconf 2.63 warnings.
add cv_ prefix to cached variable. Remove AC_ARG_PROGRAM as
automake already invokes this. When prefered AC_USE_SYSTEM_EXTENSIONS
exists, use that instead of AC_GNU_SOURCE/AC_AIX/AC_MINUX.
@@ -586,11 +586,11 @@
lib/getopt1.c, toosl/sane-desc.c, include/lgetopt.h:
Rename internal getopt.h to lgetopt.h to allow using
external getopt.h when it exists. This allows to go
back to optionally compiling getopt()/getopt_long() and its
back to optionally compiling getopt()/getopt_long() and its
prototypes and not have conflicts with external headers/symbols.
2009-02-04 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* doc/sane-pixma.man doc/descriptions/pixma.desc:
* doc/sane-pixma.man doc/descriptions/pixma.desc:
Added ImageClass MF4120 support in pixma backend docs.
2009-02-03 Julien Blache <jb@jblache.org>
@@ -613,11 +613,11 @@
* aclocalm4: fix prototype of internal strcasestr and usleep.
* configure.in: Group all USB logic together and all SCSI
logic together to aid understanding of whats no longer
valid. Allow sharing enable/disable options between all
USB drivers on multiple platforms. Combined CAM_LIBS and
SCSI_LIBS since they are mutually exclusive.
valid. Allow sharing enable/disable options between all
USB drivers on multiple platforms. Combined CAM_LIBS and
SCSI_LIBS since they are mutually exclusive.
Skip some USB/SCSI checks when previous tests show it will always fail.
* backend/Makefile.am, tools/Makefile.in: Combine CAM_LIBS and
* backend/Makefile.am, tools/Makefile.in: Combine CAM_LIBS and
SCSI_LIBS. Add missing SOCKET_LIBS to epson2. Add USB_LIB.
* saned.c: Add limits.h for PATH_MAX.
@@ -643,7 +643,7 @@
getgrent() and friends. getgrouplist is not posix and not
on several platforms including cygwin.
* acinclude.m4, configure.in: Put all libraries into their
own *_LIB variables instead of $LIB so that we do not have to
own *_LIB variables instead of $LIB so that we do not have to
link in the world to all executables. Modified SANE_CHECK_U_TYPES
to be a little more portable to platforms that use #define
for u_* types. Create SANE_CHECK_BACKENDS macro so that
@@ -680,7 +680,7 @@
* pixma_common.c: Make source match header prototype for picky
compilers (cygwin).
* backend/umax_pp_mid.c: Allow BACKEND_NAME to be filename
yet debug to be SANE_DEBUG_UMAX_PP to match man page.
yet debug to be SANE_DEBUG_UMAX_PP to match man page.
2009-01-28 Julien Blache <jb@jblache.org>
* doc/descriptions/epson.desc: added :scsi data for the GT-7000
@@ -697,9 +697,9 @@
and works around various timestamp issues.
2009-01-25 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_gl841.c: Change status code for locked head to
* backend/genesys_gl841.c: Change status code for locked head to
SANE_STATUS_HW_LOCKED
2009-01-21 m. allan noah <kitno455 a t gmail d o t com>
* doc/descriptions/canon_dr.desc: correct version, status = new
* doc/descriptions/epjitsu.desc, doc/descriptions/fujitsu.desc: version
@@ -721,7 +721,7 @@
Updated backends with EXTRA_* files to allow Makefile's
to always pass in BACKEND_NAME to be fixed to backend name
instead of filename; while still making sure that
SANE_DEBUG_${BACKEND}* exist as documented in man pages.
SANE_DEBUG_${BACKEND}* exist as documented in man pages.
Add references to epson and epson2 man pages about
SANE_DEBUG_EPSONx_SCSI and _NET options.
Created an epson2 man page; based mostly on epson page.
@@ -749,23 +749,23 @@
2009-01-19 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* pixma_imageclass.c:
Fixed select_source message length, and typo bug in last update.
Set MP4600 series for inverted checksumming.
Set MP4600 series for inverted checksumming.
2009-01-19 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys.conf.in backend/genesys.h
backend/genesys_devices.c backend/genesys_gl646.c
backend/genesys_devices.c backend/genesys_gl646.c
backend/genesys_gl841.c backend/genesys_low.h: add support for
uncalibrated scans in all modes for Visioneer Strobe XP200. Add
support for buttons for MD5345/HP2300 and XP200
2009-01-18 m. allan noah <kitno455 a t gmail d o t com>
* doc/descriptions/unsupported.desc: everything reported from
* doc/descriptions/unsupported.desc: everything reported from
2008-07 to 2009-01
2009-01-18 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_low.h: Fix prototype of update_hardware_sensors.
Make half-ccd mode optional.
* backend/genesys_gl841.c: Make dpihw depend on sensor pixel count
* backend/genesys_gl841.c: Make dpihw depend on sensor pixel count
instead of sensor resolution. Make some Canon LiDE 35 specific
gpio handling conditional, add missing SCANMOD shift. Make
half-ccd mode optional. Reenable clock register setup from sensor
@@ -775,7 +775,7 @@
2009-01-17 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* pixma_mp150.c:
Fixed "Busy mode" exit processing.
Fixed "Busy mode" exit processing.
2009-01-17 Julien Blache <jb@jblache.org>
* doc/descriptions/hp.desc: add SCSI identifiers for the ScanJet
@@ -793,7 +793,7 @@
2009-01-16 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* doc/Makefile.in, frontend/Makefile.in, include/Makefile.in,
japi/Makefile.in, lib/Makefile.in, po/Makefile.in,
japi/Makefile.in, lib/Makefile.in, po/Makefile.in,
sanei/Makefile.in, testsuite/Makefile.in, tools/Makefile.in,
backend/Makefile.in:
Updates to Makefiles to prepare for transition to automake.
@@ -803,14 +803,14 @@
2009-01-16 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys.c, backend/genesys.h, backend/genesys_devices.c,
backend/genesys_gl646.c, backend/genesys_gl841.c,
backend/genesys_low.h: Add support for buttons on
backend/genesys_gl646.c, backend/genesys_gl841.c,
backend/genesys_low.h: Add support for buttons on
Canon LiDE 35/40/50.
2009-01-15 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* doc/sane-pixma.man, doc/descriptions/pixma.desc,
* doc/sane-pixma.man, doc/descriptions/pixma.desc,
pixma_mp150.c, AUTHORS:
Updated docs and comments in pixma backend.
Updated docs and comments in pixma backend.
Added Dennis Lou to pixma backend authors
2009-01-13 Louis Lagendijk <llagendijk-guest at users.alioth.debian.org>
@@ -851,7 +851,7 @@
- stop button reqests cancel
2009-01-10 Jeremy Johnson <jeremy a t acjlaw dot net>
* backend/hs2p.c: replaced ulong with u_long,
* backend/hs2p.c: replaced ulong with u_long,
added static keyword for SANE_Status update_hs2p_data()
2009-01-06 Jonathan Bravo Lopez <jkdsoft@gmail.com>
@@ -898,7 +898,7 @@
- added print_sense_data()
- added SENSE_DATA *sdp to sense_handler()
- modified read_data() to handler other data type codes/qualifiers
- read_adf_status() now is replaced with call to
- read_adf_status() now is replaced with call to
read_data(fd,*buf,*bufsize,dtc,dtq)
2009-01-04 Nicolas Martin <nicols-guest at users.alioth.debian.org>
@@ -923,7 +923,7 @@
- deactivate double feed options if df-action == default
2008-12-21 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* doc/descriptions/pixma.desc, doc/sane-pixma.man,
* doc/descriptions/pixma.desc, doc/sane-pixma.man,
backend/pixma_mp150.c:
MP800/MP800R: Fixed bug and color planes shift issues, added TPU support
for 48 bits images depth up to 1200 dpi.
@@ -996,11 +996,11 @@
* doc/descriptions/canon_dr.desc, doc/sane-canon_dr.man: backend v8
2008-12-06 Louis Lagendijk <llagendijk-guest at users.alioth.debian.org>
* backend/pixma_bjnp.c pixma_bjnp_private.h:
* backend/pixma_bjnp.c pixma_bjnp_private.h:
replaced getlogin/getenv by getpwuid(geteuid)
2008-12-06 Louis Lagendijk <llagendijk-guest at users.alioth.debian.org>
* backend/pixma_bjnp.c pixma_bjnp_private.h:
* backend/pixma_bjnp.c pixma_bjnp_private.h:
On Ubuntu getlogin() returns NULL. So we now first try getlogin()
and if that fails, we try getenv("USER") and if that fails we use
a default user string
@@ -1064,11 +1064,11 @@
2008-11-25 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma.c:
Fixed regression bug at end of scan for all PIXMA, noticeable
Fixed regression bug at end of scan for all PIXMA, noticeable
in multipage ADF scan.
2008-11-23 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c, sane-backends/po/sane-backends.fr.po,
* backend/pixma_mp150.c, sane-backends/po/sane-backends.fr.po,
doc/descriptions/pixma.desc, doc/sane-pixma.man:
Support for MP630 in pixma backend.
Updated docs for MP630, and network interface to various PIXMA models
@@ -1153,7 +1153,7 @@
2008-10-31 Stéphane Voltz <stef.dev@free.fr>
* backend/rts8891.c backend/rts8891_low.c backend/rts8891_low.h:
added 600 and 1200 dpi scan for HP4400 and HP4470 with 'xpa'
added 600 and 1200 dpi scan for HP4400 and HP4470 with 'xpa'
sensor.
2008-10-25 Nicolas Martin <nicols-guest at users.alioth.debian.org>
@@ -1175,9 +1175,9 @@
The rest is cosmetic only.
2008-10-21 Louis Lagendijk <llagendijk-guest at users.alioth.debian.org>
* Added #ifdef around defintions of MIN and MAX in pixma_common.h
* Added #ifdef around defintions of MIN and MAX in pixma_common.h
- Re-enable includes in pixma_bjnp.c as they are needed on Freebsd
- Replaced getaddrinfo by gethostbyname in pixma_bjnp.c as this is
- Replaced getaddrinfo by gethostbyname in pixma_bjnp.c as this is
supported on OS/2 as well
2008-10-21 m. allan noah <kitno455 a t gmail d o t com>
@@ -1205,15 +1205,15 @@
dpi scan mode for HP4400
2008-10-14 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma*.c, backend/pixma*.h (all pixma backend files),
doc/sane-pixma.man, doc/description/pixma.desc,
* backend/pixma*.c, backend/pixma*.h (all pixma backend files),
doc/sane-pixma.man, doc/description/pixma.desc,
backend/Makefile.in
Added 3 new files backend/pixma_bjnp.c, backend/pixma_bjnp.h,
Added 3 new files backend/pixma_bjnp.c, backend/pixma_bjnp.h,
backend/pixma_bjnp_private.h:
- Thanks to Louis Lagendijk, added an implementation of Canon's BJNP
network protocol to the pixma backend, for scanning with PIXMA devices
over a LAN network.
- Fix for ADF scan reset session when ADF is loaded with more pages
- Fix for ADF scan reset session when ADF is loaded with more pages
to scan than the frontend requests.
- Updated pixma backend documentation and file headers.
@@ -1229,13 +1229,13 @@
bug
2008-10-04 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma.c, backend/pixma.h, backend/pixma_common.c,
backend/pixma_io_sanei.c, backend/pixma_mp150.c,
* backend/pixma.c, backend/pixma.h, backend/pixma_common.c,
backend/pixma_io_sanei.c, backend/pixma_mp150.c,
doc/sane-pixma.man, doc/description/pixma.desc:
MP970 scanning improvements, up to 4800 dpi. On the way soon,
MP970 scanning improvements, up to 4800 dpi. On the way soon,
network BJNP protocol designed by Louis Lagendijk to be added to CVS.
MX7600 reported to work fine with the backend.
ADF scanning:
ADF scanning:
- improved for latest PIXMAs like MX850, MX310.
- bug fix in Sane_start, when scanning several pages with ADF.
ADF DUPLEX scanning:
@@ -1251,10 +1251,10 @@
- change page length autodetection condition
2008-10-03 Stéphane Voltz <stef.dev@free.fr>
* include/sane/sane.h: added a SANE_CURRENT_MINOR define
* include/sane/sane.h: added a SANE_CURRENT_MINOR define
2008-10-02 Stéphane Voltz <stef.dev@free.fr>
* backend/rts8891.c backend/rts8891.h backend/rts8891_low.h:
* backend/rts8891.c backend/rts8891.h backend/rts8891_low.h:
add a 'sensornumber' option to override detected sensor model
2008-10-02 m. allan noah <kitno455 a t gmail d o t com>
@@ -1302,7 +1302,7 @@
2008-09-25 m. allan noah <kitno455 a t gmail d o t com>
* include/sane/saneopts.h: underscore not allowed in option names
* frontend/scanimage.c: fix broken unknown length (-1) binary scans,
fix invalid tiff height with unknown length scans, fix compiler warn
fix invalid tiff height with unknown length scans, fix compiler warn
2008-09-20 Stéphane Voltz <stef.dev@free.fr>
* backend/rts8891.c: fix typo in HP4400 variant detection
@@ -1403,7 +1403,7 @@
descriptor 0 before attempting to get the value of option 0.
2008-08-04 Stéphane Voltz <stef.dev@free.fr>
* backend/umax_pp.c backend/umaxp_pp.h backend/umax_pp.conf.in:
* backend/umax_pp.c backend/umaxp_pp.h backend/umax_pp.conf.in:
use configuration framework
2008-08-02 m. allan noah <kitno455 a t gmail d o t com>
@@ -1467,7 +1467,7 @@
2008-07-10 Stéphane Voltz <stef.dev@free.fr>
* sanei/sanei_config.c: handle cases where config or callback
function is NULL
function is NULL
* backend/rts8891.c: use new configuration parsing framework
2008-07-10 Stéphane Voltz <stef.dev@free.fr>
@@ -1501,14 +1501,14 @@
* backend/fujitsu.[ch]: backend v69, support hot-unplugging scanners
2008-07-02 m. allan noah <kitno455 a t gmail d o t com>
* backend/fujitsu.[ch], backend/fujitsu-scsi.h: backend v68,
* backend/fujitsu.[ch], backend/fujitsu-scsi.h: backend v68,
- add halftone type and pattern options
- support M3097G with IPC and CMP options via modified VPD response
* doc/descriptions/fujitsu.desc, doc/sane-fujitsu.man: backend v68,
- manpage cleanup
2008-07-01 m. allan noah <kitno455 a t gmail d o t com>
* backend/fujitsu.[ch], backend/fujitsu-scsi.h: backend v67,
* backend/fujitsu.[ch], backend/fujitsu-scsi.h: backend v67,
- add IPC/DTC/SDTC options
- call check_for_cancel() in sane_cancel, unless reading flag is set
@@ -1530,7 +1530,7 @@
2008-06-25 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_imageclass.c:
Patch from Sam Varshavchik to deal with libusb 64 read issue,
Patch from Sam Varshavchik to deal with libusb 64 read issue,
for ImageClass MFPs.
2008-06-24 m. allan noah <kitno455 a t gmail d o t com>
@@ -1597,14 +1597,14 @@
2008-05-29 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* doc/sane-pixma.man: man update.
* backend/pixma_io_sanei.c: update status types, and take into
* backend/pixma_io_sanei.c: update status types, and take into
account new ones.
2008-05-15 Mattias Ellert <mattias.ellert@fysast.uu.se>
* backend/hp3900_sane.c: Correct typos.
* po/Makefile.in: add backend/rts8891.c to localization.
* po/sane-backends.sv.po: update Swedish localization.
2008-05-27 m. allan noah <kitno455 a t gmail d o t com>
* frontend/scanimage.c: add %n for newline to -f option
@@ -1640,7 +1640,7 @@
2008-05-22 Jonathan Bravo Lopez <jkdsoft@gmail.com>
* backend/hp3900_sane.c: use 1.1.0 well-known option group strings.
* backend/hp3900_config.c, backend/hp3900_debug.c,
* backend/hp3900_config.c, backend/hp3900_debug.c,
backend/hp3900_rts8822.c, backend/hp3900_types.c,
backend/hp3900_usb.c: Fixed reference position detection for
HP3800/HPG2710 scanners. Code clean up.
@@ -1710,7 +1710,7 @@
Fix for bug #306751: sanei-thread with pthreads on 64 bit
2008-05-12 Stéphane Voltz <stef.dev@free.fr>
* backend/rts8891.c
* backend/rts8891.c
150/300 dpi mode fixes for 'XPA' sensor HP4470 models
2008-05-08 Alessandro Zummo <a.zummo@towertech.it>
@@ -1774,7 +1774,7 @@
2008-04-22 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c:
Updated pixma backend to have MP970 (tested), and probably other
Updated pixma backend to have MP970 (tested), and probably other
CCD sensor MPs, working for Grayscale scan.
2008-04-21 Nicolas Martin <nicols-guest at users.alioth.debian.org>
@@ -1803,13 +1803,13 @@
* backend/pixma_mp150.c, backend/pixma.h, backend/pixma_mp150.c
doc/sane-pixma.man, doc/descriptions/pixma.desc:
With feedback from MP970 owner, updated pixma backend for MP970
CCD sensor support (yet in color only), and more generally,
CCD sensor support (yet in color only), and more generally,
support for other CCD sensor PIXMA: MP800, MP810, MP830, MP960,
but yet untested, which produce shifted color planes
scanned images. Current trim based on sample images provided
in bug reports and other web pages, but might require some
but yet untested, which produce shifted color planes
scanned images. Current trim based on sample images provided
in bug reports and other web pages, but might require some
few and simple final tweaks.
Also fixed a bug for MP220 at 1200 dpi, MP220 is now reported
Also fixed a bug for MP220 at 1200 dpi, MP220 is now reported
to work fine.
2008-04-13 Julien Blache <jb@jblache.org>
@@ -1869,13 +1869,13 @@
* backend/pixma_mp150.c, backend/pixma.h, backend/pixma_mp150.c
doc/sane-pixma.man, doc/descriptions/pixma.desc:
With feedback from MP970 owner, updated pixma backend for MP970
CCD sensor support (yet in color only), and more generally,
CCD sensor support (yet in color only), and more generally,
support for other CCD sensor PIXMA: MP800, MP810, MP830, MP960,
but yet untested, which produce shifted color planes
scanned images. Current trim based on sample images provided
in bug reports and other web pages, but might require some
but yet untested, which produce shifted color planes
scanned images. Current trim based on sample images provided
in bug reports and other web pages, but might require some
few and simple final tweaks.
Also fixed a bug for MP220 at 1200 dpi, MP220 is now reported
Also fixed a bug for MP220 at 1200 dpi, MP220 is now reported
to work fine.
2008-04-13 Julien Blache <jb@jblache.org>
@@ -1913,7 +1913,7 @@
* doc/saned.man: document -a username.
2008-04-06 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c:
* backend/pixma_mp150.c:
Modifications for PIXMA MP970, to manage the CCD sensor
with PIXMA generation 3 protocol. To be tested.
@@ -1936,13 +1936,13 @@
fixed 'reset stream' problem for MD6471.
2008-04-05 Stéphane Voltz <stef.dev@free.fr>
* backend/rts8891.c:
* backend/rts8891.c:
split sane_control_option() to make it more readable
2008-04-02 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c, backend/pixma.c, doc/sane-pixma.man,
doc/descriptions/pixma.desc:
Added a 10s tempo before "NO PAPER" fail message appears in ADF scan,
* backend/pixma_mp150.c, backend/pixma.c, doc/sane-pixma.man,
doc/descriptions/pixma.desc:
Added a 10s tempo before "NO PAPER" fail message appears in ADF scan,
declared PIXMA MX850, moved MP970 to Generation 3 protocol, but yet
untested.
@@ -1985,8 +1985,8 @@
instead of "sane-port".
2008-03-16 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c, backend/pixma.h, doc/sane-pixma.man,
doc/descriptions/pixma.desc:
* backend/pixma_mp150.c, backend/pixma.h, doc/sane-pixma.man,
doc/descriptions/pixma.desc:
Changes to have new Canon PIXMA MX700 working with pixma backend
Flatbed and ADF scan are supported.
@@ -2015,21 +2015,21 @@
and more debug output in init_ms(), for fi-5900
2008-02-24 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c, doc/sane-pixma.man,
doc/descriptions/pixma.desc:
* backend/pixma_mp150.c, doc/sane-pixma.man,
doc/descriptions/pixma.desc:
Changes to have Canon PIXMA MP140 now working with pixma backend
2008-02-23 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_gl841.c: Make LEDs go really dark when "lamp" is off
2008-02-22 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c, backend/pixma_mp730.c,
doc/sane-pixma.man, doc/descriptions/pixma.desc:
* backend/pixma_mp150.c, backend/pixma_mp730.c,
doc/sane-pixma.man, doc/descriptions/pixma.desc:
Changed MP140 to experimental cause not working yet
Changed MP710 to non-ADF scanner
2008-02-22 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_gl841.c: Fix debugging output of
* backend/genesys_gl841.c: Fix debugging output of
gl841_bulk_write_register
2008-02-21 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
@@ -2052,7 +2052,7 @@
doc/sane-pixma.man, doc/descriptions/pixma.desc,
doc/descriptions-external/canon_mfp.desc:
> New models changes:
> New models changes:
- added: Pixma MP210, MP470, MP520, MP610, MP710
- declared but untested: Pixma MP140, MP220, MP740
- declared experimental and untested: MP970
ChangeLogs/ChangeLog-1.0.21
+42 -42
View File
@@ -24,14 +24,14 @@
- invert usb status, add 0x to usbids, add missing KV-S1045 usbid
2010-04-12 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c, backend/pixma_io_sanei.c,
* backend/pixma_mp150.c, backend/pixma_io_sanei.c,
doc/descriptions/pixma.desc, doc/sane-pixma.man:
pixma: added changes from Gernot Hassenpflug to fully support
Canoscan 8800F.
debug code clean-up in pixma_mp150.c
2010-04-12 Chris Bagwell <chris at cnpbagwell dot com>
* backend/p5.c, backend/p5_device.c, backend/p5.h:
* backend/p5.c, backend/p5_device.c, backend/p5.h:
Remove references to libc.h in p5.h. On OSX, it was including
socket.h and causing compile fail with conflicting connect()
functions. Since backend doesn't support network
@@ -45,7 +45,7 @@
helps out ming when we define _BSDTYPES_DEFINED.
2010-03-25 Stéphane Voltz <stef.dev at free.fr>
* backend/p5.c backend/p5_device.[ch] backend/genesys_gl646.c:
* backend/p5.c backend/p5_device.[ch] backend/genesys_gl646.c:
replace u_int8_t and u_int16_t by uint8_t and uint16_t
2010-04-06 Chris Bagwell <chris at cnpbagwell dot com>
@@ -86,7 +86,7 @@
2010-03-15 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.[ch] backend/genesys_devices.c backend/genesys_low.h
backend/genesys_gl646.[ch] backend/genesys_gl841.c: full transparency
backend/genesys_gl646.[ch] backend/genesys_gl841.c: full transparency
adaptor support for gl646 based scanners
2010-03-11 Stéphane Voltz <stef.dev at free.fr>
@@ -160,7 +160,7 @@
2010-02-15 Stéphane Voltz <stef.dev at free.fr>
* backend/p5.c backend/p5.h backend/p5_device.c backend/p5_device.h
backend/p5.conf.in doc/descriptions/p5.desc doc/sane-p5.man: add new p5 backend for
backend/p5.conf.in doc/descriptions/p5.desc doc/sane-p5.man: add new p5 backend for
Primax PagePartner
* backend/dll.conf.in backend/Makefile.* configure* doc/Makefile.*
doc/sane.man: p5 backend integration changes
@@ -174,7 +174,7 @@
* backend/kvs1025*: add new backend from Panasonic Russia, Ltd.
* backend/Makefile.*, configure*, doc/Makefile.*, doc/sane.man:
backend integration changes
* doc/desciptions/kvs1025.desc, doc/sane-kvs1025.man:
* doc/desciptions/kvs1025.desc, doc/sane-kvs1025.man:
the parts Panasonic forgot
2010-02-12 m. allan noah <kitno455 at gmail dot com>
@@ -262,12 +262,12 @@
lineart.
2010-01-30 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.conf.in backend/genesys_devices.c
* backend/genesys.conf.in backend/genesys_devices.c
doc/descriptions/genesys.desc doc/sane-genesys.man: add Xerox Travel
Scanner 100, work by Andrey Loginov <avloginov@gmail.com>
2010-01-29 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_io.h, backend/pixma_imageclass.c,
* backend/pixma_io.h, backend/pixma_imageclass.c,
doc/sane-pixma.man, doc/descriptions/pixma.desc:
pixma: changed usb timeouts to 20 sec to support ImageClass MF3240.
updated source code comments and documentation.
@@ -288,10 +288,10 @@
for generation 3+ devices.
2010-01-19 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys.conf.in backend/genesys.h
backend/genesys_conv.c backend/genesys_devices.c
* backend/genesys.c backend/genesys.conf.in backend/genesys.h
backend/genesys_conv.c backend/genesys_devices.c
backend/genesys_gl646.c backend/genesys_gl841.c backend/genesys_low.h
doc/descriptions/genesys.desc doc/sane-genesys.man: add Visioneer
doc/descriptions/genesys.desc doc/sane-genesys.man: add Visioneer
OneTouch 7100 (patch by Jack McGill). Add software lineart option.
2010-01-17 Stéphane Voltz <stef.dev at free.fr>
@@ -330,12 +330,12 @@
sheetfed scanners
2009-12-09 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* doc/descriptions/pixma.desc, doc/sane-pixma.man,
* doc/descriptions/pixma.desc, doc/sane-pixma.man,
backend/pixma_imageclass.c, backend/pixma_mp150.c:
pixma: updated backend, docs and desc for support to MP560 and MF4330d/ADF
2009-12-06 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* doc/descriptions/pixma.desc, doc/sane-pixma.man,
* doc/descriptions/pixma.desc, doc/sane-pixma.man,
backend/pixma.h, backend/pixma.c, backend/pixma_mp150.c:
pixma: bumped version, added compilation type debug message.
updated doc and desc (support for MX330)
@@ -357,18 +357,18 @@
2009-11-30 Stéphane Voltz <stef.dev at free.fr>
* backend/gt68xx.c backend/gt68xx_high.c backend/gt68xx_high.h
backend/gt68xx_low.h backend/gt68xx_gt6816.h backend/gt68xx_gt6816.c:
backend/gt68xx_low.h backend/gt68xx_gt6816.h backend/gt68xx_gt6816.c:
implement request '0x59' which detects document presence for 6816. Add
a sensor option to reports document presence, and test for document
before scan for 6816 sheetfed scanners.
2009-11-29 Stéphane Voltz <stef.dev at free.fr>
* backend/gt68xx.c backend/gt68xx_high.c backend/gt68xx_high.h:
added 'clear calibration' button option and 'need calibration'
added 'clear calibration' button option and 'need calibration'
sensor option.
2009-11-28 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma.c, backend/pixma_mp1580.c,
* backend/pixma.c, backend/pixma_mp1580.c,
doc/descriptions/pixma.desc, doc/sane-pixma.man:
pixma: fix pixma backend (end of scan), when compiled with USE_PTHREAD/-lpthread
set support to complete for MP990 in documentation, as reported by Jean-Michel Poure.
@@ -402,7 +402,7 @@
from good to complete for well supported models.
2009-11-16 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.conf.in backend/genesys_gl841.c
* backend/genesys.conf.in backend/genesys_gl841.c
doc/descriptions/genesys.desc : applied fixes and status update from
Jack McGill.
@@ -446,7 +446,7 @@
pixma: updated doc to include support for MP270 and ImageClass MF3110
2009-10-18 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c, backend/pixma_imageclass.c, backend/pixma.h,
* backend/pixma_mp150.c, backend/pixma_imageclass.c, backend/pixma.h,
doc/descriptions/pixma.desc, doc/sane-pixma.man:
pixma:
- bumped backend version to 0.16.1
@@ -489,7 +489,7 @@
2009-09-27 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_bjnp.c, backend/pixma_mp730.c:
Print size_t values as %lu with cast to unsigned long
Print size_t values as %lu with cast to unsigned long
as prescribed in the file doc/backend_writing.txt, to avoid
compile warnings.
Removed unused debug code.
@@ -499,7 +499,7 @@
patch by Tollef Fog Heen <tfheen@err.no>.
2009-09-16 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c, doc/descriptions/pixma.desc,
* backend/pixma_mp150.c, doc/descriptions/pixma.desc,
doc/sane-pixma.man:
pixma backend: Updated documentation for:
- Pixma MP260 support
@@ -515,7 +515,7 @@
2009-09-13 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c, backend/pixma_mp730.c:
pixma backend: Declared new Pixma models MP250, MP490, MP560, MP640,
pixma backend: Declared new Pixma models MP250, MP490, MP560, MP640,
and MP990, all yet untested, and modified some debug code.
2009-09-11 Mattias Ellert <mattias.ellert@fysast.uu.se>
@@ -563,15 +563,15 @@
* doc/descriptions/fujitsu.desc: various status and comment updates
2009-08-07 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_gl646.c backend/genesys_devices.c:
* backend/genesys_gl646.c backend/genesys_devices.c:
- small fixes for hp3670 support
2009-08-05 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c:
* backend/genesys.c:
- fixed shading calibration for hp2300 when dpi <= 300
2009-08-04 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys_gl646.c backend/genesys_devices.c:
* backend/genesys.c backend/genesys_gl646.c backend/genesys_devices.c:
- fixed document end detection for gl646 cis scanners
- disable color filter fro gray mode for gl646 cis scanners
@@ -583,7 +583,7 @@
* frontend/tstbackend.c: remove WARMING_UP_STATUS usage
2009-07-30 Jonathan Bravo Lopez <jkdsoft at gmail dot com>
* backend/hp3900_config.c:
* backend/hp3900_config.c:
- Fixed bug [#311856] possible for loop overflow
2009-07-29 m. allan noah <kitno455 at gmail dot com>
@@ -603,7 +603,7 @@
2009-07-25 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
- Fix in declarations for Pixma MX320, MX330 and MX860,
- Fix in declarations for Pixma MX320, MX330 and MX860,
- Updated docs for MX860, confirmed to be supported.
2009-06-23 m. allan noah <kitno455 at gmail dot com>
@@ -625,24 +625,24 @@
* backend/xerox_mfp.c: more sanity checking for debug mode.
2009-07-15 Stéphane Voltz <stef.dev at free.fr>
* backend/lexmark.h: disable deep debugging
* backend/lexmark.h: disable deep debugging
2009-07-10 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys.c backend/genesys_gl646.c backend/genesys_low.h
backend/genesys_gl646.h backend/genesys_gl841.c
backend/genesys_gl646.h backend/genesys_gl841.c
backend/genesys_devices.c backend/genesys.h:
- add shading calibration for sheetfed scanners
- shading calibration fix for all gl646 based scanners
2009-07-06 Stéphane Voltz <stef.dev at free.fr>
* backend/lexmark.c backend/lexmark.h backend/lexmark_low.h:
* backend/lexmark.c backend/lexmark.h backend/lexmark_low.h:
do not use resolution higher than sensor resolution when doing
calibation.
2009-07-02 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma.h, backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
- Declared new models (yet untested) Pixma MX330 and MX860, updated docs.
- Bump backend minor version number.
- Bump backend minor version number.
2009-07-01 Alex Belkin <abc at telekom.ru>
* backend/xerox_mfp.conf.in: usbid for Samsung SCX-4500W
@@ -750,12 +750,12 @@
Modifications to support Canon ImageClass MF5770
2009-06-04 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_gl841.c: Make calibration steps always send
* backend/genesys_gl841.c: Make calibration steps always send
registers before trying to acquire a line.
2009-05-29 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* doc/descriptions/genesys.desc:
Added description for Visioneer XP100r3, Visioneer Roadwarrior,
* doc/descriptions/genesys.desc:
Added description for Visioneer XP100r3, Visioneer Roadwarrior,
demoted DocketPort 465 to "untested"
2009-05-28 m. allan noah <kitno455 at gmail dot com>
@@ -788,20 +788,20 @@
* backend/pixma_imageclass.c, backend/pixma_mp730.c, sanei/sanei_usb.c:
- pixma_imageclass.c: supported devices list cleanup.
- pixma_mp730.c: fixed scan area width adjust and end of scan protocol for MP730.
- sanei/sanei_usb.c: in sanei_usb_open(), changed "endpoints seek loop" to
- sanei/sanei_usb.c: in sanei_usb_open(), changed "endpoints seek loop" to
take into account only interfaces detected by sanei_usb_init()
Fixes Pixma MP730 usb wrong endpoints selection.
Fixes Pixma MP730 usb wrong endpoints selection.
2009-05-19 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_devices.c, backend/genesys_low.h:
* backend/genesys_devices.c, backend/genesys_low.h:
Add Pentax DSmobile 600, Syscan 485, DCT 487
2009-05-18 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_gl646.h: fixed missing part of the include
2009-05-13 Stéphane Voltz <stef.dev at free.fr>
* backend/genesys_gl646.c backend/genesys_gl646.h: created a
genesys_gl646.h header file, moved all declarations from
genesys_gl646.h header file, moved all declarations from
genesys_gl646.c to this file.
2009-05-13 Nicolas Martin <nicols-guest at users.alioth.debian.org>
@@ -831,7 +831,7 @@
- compare page counter of small scanners only in non-buffered mode
- add back-side gray mirroring code for DR-2580C
2009-05-06 Nicolas Martin <nicols-guest at users.alioth.debian.org>
2009-05-06 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* doc/descriptions/pixma.desc:
Updated descriptions in pixma backend for ImageClass MF4010 and MF4018.
@@ -845,7 +845,7 @@
marked as completely supported
* tools/check-usb-chip.c:
Updated HP ScanJet model names displayed during the check_hp5590().
* backend/hp5590.c, backend/hp5590_cmds.c, backend/hp5590_cmds.h,
* backend/hp5590.c, backend/hp5590_cmds.c, backend/hp5590_cmds.h,
backend/hp5590_low.c, backend/hp5590_low.h, doc/sane-hp5590.man:
Updated the list of supported devices (added HP 5500C which is similar
to 4570C, 5500C which is similar to 4500C) - only strings/comments, no
@@ -878,9 +878,9 @@
remove :new tag
2009-05-03 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* Makefile.in, aclocal.m4, configure, */Makefile.in: Regenerated
* Makefile.in, aclocal.m4, configure, */Makefile.in: Regenerated
with newer automake.
* backend/Makefile.am, tools/sane-config.in: Add missing
* backend/Makefile.am, tools/sane-config.in: Add missing
$GPHOTO2_LDFLAGS so library can be found.
* tools/Makefile.am: Add mising $SCSI_LIBS to sane-find-scanner.
ChangeLogs/ChangeLog-1.0.22
+22 -22
View File
@@ -38,7 +38,7 @@
2011-01-26 m. allan noah <kitno455 at gmail dot com>
* backend/canon_dr.[ch], doc/descriptions/canon_dr.desc,
backend/canon_dr.conf.in, doc/sane-canon_dr.man:
backend/canon_dr.conf.in, doc/sane-canon_dr.man:
canon_dr backend v37:
- don't center window when using flatbed
- improve request sense error messages
@@ -53,12 +53,12 @@
2011-01-18 m. allan noah <kitno455 at gmail dot com>
* backend/canon_dr.[ch], doc/desc/canon_dr.desc, doc/sane-canon_dr.man:
canon_dr backend v36:
- initial support for DR-3080 and DR-5060
- add code to clamp scan width to an arbitrary byte width boundary
- add code to prevent setting of brightness/threshold/contrast
- don't send dropout color command on non-color scanners
- initial support for DR-7090C
- update credits
- initial support for DR-3080 and DR-5060
- add code to clamp scan width to an arbitrary byte width boundary
- add code to prevent setting of brightness/threshold/contrast
- don't send dropout color command on non-color scanners
- initial support for DR-7090C
- update credits
* po/pl.po: updated translation from Jakub Bogusz
* po/de.po: updated translation from Matthias Mailander
* backend/canon.conf.in: improved detection of scsi scanners
@@ -85,7 +85,7 @@
2011-01-06 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c
backend/genesys_gl847.c: fix lineart issue when yres is higher than
xres and dynamic lineart is enabled, make gl847 wait for head to
xres and dynamic lineart is enabled, make gl847 wait for head to
park between scans, wait for head ot park in sane_close()
2011-01-05 Nicolas Martin <nicols-guest at users.alioth.debian.org>
@@ -136,7 +136,7 @@
* backend/genesys.c backend/genesys.conf.in backend/genesys_devices.c
backend/genesys_gl841.c backend/genesys_low.h
doc/descriptions/genesys.desc doc/descriptions/unsupported.desc
doc/sane-genesys.man: add Plustek OpticBook 3600 support
doc/sane-genesys.man: add Plustek OpticBook 3600 support
by Chris Berry <s0457957@sms.ed.ac.uk> and Michael Rickmann <mrickma@gwdg.de>
2010-12-27 Stéphane Voltz <stef.dev@free.fr>
@@ -205,7 +205,7 @@
interface list.
2010-12-02 m. allan noah <kitno455 at gmail dot com>
* backend/fujitsu.[ch], backend/fujitsu-scsi.h:
* backend/fujitsu.[ch], backend/fujitsu-scsi.h:
Fujitsu backend version 105
- backup and restore image params around image processing code
- cache software crop/deskew parameters for use on backside of duplex
@@ -216,7 +216,7 @@
and D2.
2010-11-24 m. allan noah <kitno455 at gmail dot com>
* backend/fujitsu.c, backend/fujitsu.conf.in,
* backend/fujitsu.c, backend/fujitsu.conf.in,
doc/descriptions/fujitsu.desc, doc/sane-fujitsu.man:
Fujitsu backend versions 103 and 104
- remove compiled-in default config file
@@ -229,7 +229,7 @@
from Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>.
2010-11-17 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c: don't write scan data unless specified by debug
* backend/genesys.c: don't write scan data unless specified by debug
level.
2010-11-08 Marc Deslauriers <marc.deslauriers@ubuntu.com>
@@ -247,16 +247,16 @@
2010-11-01 Stéphane Voltz <stef.dev@free.fr>
* frontend/scanimage.c: don't print readonly device options since
they can't be set on command line
2010-11-01 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl843.c
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl843.c
backend/genesys_gl843.h backend/genesys_gl847.c: up build number to 41,
rework head parking,
fixed clear-calibration option reading,
fixed clear-calibration option reading,
make calibration cache expire for non sheetfed gl847 scanners,
tuned KV-SS080 timings to improve image quality,
raised LiDE 100/200 defaukt gamma to 1.7
2010-10-31 Julien Blache <jb@jblache.org>
* doc/descriptions/hp.desc: add SCSI IDs for ScanJet 4c.
@@ -266,10 +266,10 @@
config file.
2010-10-13 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl843.c
* backend/genesys_devices.c backend/genesys_gl843.c
backend/genesys_gl843.h: added 100, 150, 400 and 600 dpi modes for
G4050 and G4010. Added 500 and 400 dpi modes for KV-SS080
2010-09-30 Alex Belkin <abc@telekom.ru>
* Makefile.in backend/Makefile.am backend/Makefile.in backend/xerox_mfp-tcp.c
backend/xerox_mfp-usb.c backend/xerox_mfp.c backend/xerox_mfp.conf.in backend/xerox_mfp.h
@@ -355,7 +355,7 @@
2010-08-31 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys.conf.in backend/genesys.c
backend/genesys_gl843.[ch] backend/Makefile.am backend/Makefile.in:
backend/genesys_gl843.[ch] backend/Makefile.am backend/Makefile.in:
support for gl843 based scanners, starting with KV-SS080.
disable true gray for LIDE35/50 since it breaks scanning
@@ -370,7 +370,7 @@
some MF8030 settings, but device not yet supported.
2010-07-22 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c, backend/pixma_imageclass.c,
* backend/pixma_mp150.c, backend/pixma_imageclass.c,
doc/descriptions/pixma.desc, doc/sane-pixma.man:
pixma: add support for PIXMA MX870.
declared PIXMA MF8030, but not yet working.
@@ -411,7 +411,7 @@
* backend/fujitsu.c: Fix compilation bug when jpeg support is enabled.
2010-06-23 Julien Blache <jb@jblache.org>
* various: corrected initialization, printing, etc. in many backends
* various: corrected initialization, printing, etc. in many backends
2010-06-21 Julien Blache <jb@jblache.org>
* tools/sane-desc.c: udev rules: set libsane_matched=yes for SCSI
@@ -506,7 +506,7 @@
backend/Makefile.in: start of LiDE 100 and LIDE 200 support
2010-05-16 Stéphane Voltz <stef.dev@free.fr>
* sanei/sanei_usb.c include/sane/sanei_usb.h: add a sanei_usb_reset()
* sanei/sanei_usb.c include/sane/sanei_usb.h: add a sanei_usb_reset()
function.
2010-05-15 m. allan noah <kitno455 at gmail dot com>
ChangeLogs/ChangeLog-1.0.23
+34 -34
View File
@@ -8,16 +8,16 @@
was still conflicting the epjistu and snapscan backends.
2012-08-16 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma.[ch], backend/pixma_common.[ch],
* backend/pixma.[ch], backend/pixma_common.[ch],
backend/pixma_imageclass.c, backend/pixma_mp*.c:
Copyright updated.
2012-08-11 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma.c, backend/pixma_mp150.c, backend/pixma_mp810.c:
Lineart fix for generation 1+2 scanners.
Lineart fix for generation 1+2 scanners.
2012-08-09 Paul Newall <quandry at ntlworld dot com>
* /backend/kodakaio.c:
* /backend/kodakaio.c:
calling of poll tidied up, may fix problems with repeated scans.
2012-07-30 Stéphane Voltz <stef.dev@free.fr>
@@ -51,35 +51,35 @@
fix batch scanning for gl646 scanners
2012-07-29 Paul Newall <quandry at ntlworld dot com>
* /doc/descriptions/kodakaio.desc:
* /doc/descriptions/kodakaio.desc:
advent AW10 added.
2012-07-28 Paul Newall <quandry at ntlworld dot com>
* /doc/descriptions/kodakaio.desc:
* /doc/descriptions/kodakaio.desc:
usbids added and version.
2012-07-28 Rolf Bensch <rolf at bensch hyphen online dot de>
* doc/descriptions/pixma.desc: scanners resorted by name
* backend/pixma_mp150.c, doc/descriptions/pixma.desc,
* backend/pixma_mp150.c, doc/descriptions/pixma.desc,
doc/sane-pixma.man: new scanners reported by DMoeller
- Canon PIXMA MX410 as untested
- Canon PIXMA MX420 as complete
- Canon PIXMA E500, E600, MX370 Series, MX430 Series, MX710 Series
as untested and experimental
* backend/pixma_mp150.c, doc/descriptions/pixma.desc: capabilities updated
for Canon PIXMA MX510 and MX890
for Canon PIXMA MX510 and MX890
* backend/pixma_mp150.c, doc/sane-pixma.man: all 2012 untested new devices
marked as experimental
marked as experimental
2012-07-26 Rolf Bensch <rolf at bensch hyphen online dot de>
* README.linux:
* README.linux:
New detailled description for the installation of SANE backend.
2012-07-24 m. allan noah <kitno455 at gmail dot com>
* backend/kvs40xx_opt.c: Oops- it is new
* doc/descriptions/kvs40xx.desc: Fix typo (Yuri Chornoivan)
* po/uk.po: Updated (Yuri Chornoivan)
* tools/Makefile.am, tools/Makefile.in, tools/sane-config.in:
* tools/Makefile.am, tools/Makefile.in, tools/sane-config.in:
sane-config fixes (Ruediger Meier)
2012-07-15 Ilia Sotnikov <hostcc@gmail.com>
@@ -100,7 +100,7 @@
2012-06-28 Paul Newall <quandry@ntlworld.com>
* backend/kodakaio.c backend/kodakaio.conf.in backend/kodakaio.h
doc/sane-kodakaio.man doc/descriptions/kodakaio.desc
configure.in makefile.am dllconf.in doc/makefile.am: Added new backend kodakaio for
configure.in makefile.am dllconf.in doc/makefile.am: Added new backend kodakaio for
kodak ESP nnnn, Cnnn, hero AiOs, detection of cups added to configure
since cups is used for network auto detection.
@@ -113,9 +113,9 @@
enabled by capability PIXMA_CAP_48BIT
* backend/pixma_mp150.c: unused capability PIXMA_CAP_48BIT removed
* backend/pixma_mp810.c:
- new capability for CS9000F: PIXMA_CAP_48BIT
- new capability for CS9000F: PIXMA_CAP_48BIT
- functions for scan mode detection improved
- lowest resolution for 48 bit flatbed scan modes is 150 dpi
- lowest resolution for 48 bit flatbed scan modes is 150 dpi
* po/de.po: German translations for new scan modes
2012-06-04 Stéphane Voltz <stef.dev@free.fr>
@@ -151,7 +151,7 @@
2012-05-28 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl124.c
backend/genesys_gl847.c backend/genesys_gl847.h backend/genesys_low.h
doc/descriptions/genesys.desc doc/sane-genesys.man:
doc/descriptions/genesys.desc doc/sane-genesys.man:
add support for LiDE 700F up to 2400 dpi
2012-05-10 m. allan noah <kitno455 at gmail dot com>
@@ -175,7 +175,7 @@
- improve (disabled) debug logs
2012-05-03 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma_io_sanei.c, backend/pixma_mp150.c,
* backend/pixma_io_sanei.c, backend/pixma_mp150.c,
doc/descriptions/pixma.desc, doc/sane-pixma.man:
Patch for Canon Pixma MP280 from Daniel Beer.
- PIXMA_EOF mapped to PIXMA_ETIMEDOUT.
@@ -187,15 +187,15 @@
2012-04-20 Rolf Bensch <rolf at bensch hyphen online dot de>
* tools/sane-desc.c: tools/udev/libsane.rules supports scanner group
access to any scanner, with and without acl support.
access to any scanner, with and without acl support.
2012-04-17 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma.c, backend/pixma_sane_options.c, po/de.po:
New description for device specific option "source".
2012-04-17 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma.c: select first entries of dynamic dpi list
and dynamic mode list as default values after changing the scan source
* backend/pixma.c: select first entries of dynamic dpi list
and dynamic mode list as default values after changing the scan source
2012-04-04 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
@@ -255,23 +255,23 @@
* backend/pixma_bjnp.c: Replace index() with strchr(). Bug #313563.
2012-02-29 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma.[ch], backend/pixma_common.c,
backend/pixma_sane_options.[ch]: New device specific option
* backend/pixma.[ch], backend/pixma_common.c,
backend/pixma_sane_options.[ch]: New device specific option
'threshold-curve'. Can be used to optimize 1 bit B/W lineart scans.
2012-02-27 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma_imageclass.c, doc/descriptions/pixma.desc,
doc/sane-pixma.man: New scanner Canon imageCLASS MF4410 from
* backend/pixma_imageclass.c, doc/descriptions/pixma.desc,
doc/sane-pixma.man: New scanner Canon imageCLASS MF4410 from
Vasiliy Olekhov.
2012-02-16 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma.c, backend/pixma_sane_options.[ch]:
* backend/pixma.c, backend/pixma_sane_options.[ch]:
New device specific option 'gamma'.
2012-02-09 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma.[ch], backend/pixma_common.[ch],
* backend/pixma.[ch], backend/pixma_common.[ch],
backend/pixma_sane_options.[ch], backend/pixma_mp{150,810}.c:
1 bit B/W lineart for pixma_mp150 and pixma_810 subdrivers.
1 bit B/W lineart for pixma_mp150 and pixma_810 subdrivers.
2012-02-06 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma_mp150, doc/descriptions/pixma.desc, doc/sane-pixma.man:
@@ -281,15 +281,15 @@
* backend/pixma.h: set PIXMA_VERSION_{MAJOR,MINOR,BUILD} to 0.16.3.
2012-02-03 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/scripts/pixma_gen_options.py: script to generate
backend/pixma_sane_options.c and backend/pixma_sane_options.h
* backend/scripts/pixma_gen_options.py: script to generate
backend/pixma_sane_options.c and backend/pixma_sane_options.h
from pixma.c. Found in old pixma project archive file
http://home.arcor.de/wittawat/pixma/mp150-0.13.1.tar.bz2.
2012-01-31 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma.[ch], backend/pixma_imageclass.c, backend/pixma_mp[17]50.c,
backend/pixma_mp730.c, backend/pixma_mp810.c: modify dpi_list dependent on
different scanner capabilities for normal (flatbed) and ADF/TPU modes.
different scanner capabilities for normal (flatbed) and ADF/TPU modes.
2012-01-23 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma_mp150, doc/descriptions/pixma.desc, doc/sane-pixma.man:
@@ -372,7 +372,7 @@
2011-11-20 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_*.[ch] doc/descriptions/genesys.desc: build
66. Add hp N6310 and 4850C devices. Fix gl847 calibration.
66. Add hp N6310 and 4850C devices. Fix gl847 calibration.
GL843 XPA support groundwork.
2011-11-14 Chris Bagwell <chris at cnpbagwell dot com>
@@ -571,7 +571,7 @@
* doc/descriptions/canon_dr.desc: status of DR-5020
2011-07-06 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_low.h backend/genesys_gl847.c backend/genesys.c
* backend/genesys_low.h backend/genesys_gl847.c backend/genesys.c
backend/genesys_gl124.c backend/genesys_gl843.c backend/genesys_gl646.c
backend/genesys_gl841.c: improve 4800 dpi quality for LiDE 200 by
increasing the number of lines scan for shading
@@ -603,13 +603,13 @@
* backend/genesys.c backend/genesys_gl847.c: lineart fix
2011-06-13 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl646.c
* backend/genesys_devices.c backend/genesys_gl646.c
backend/genesys_gl646.h doc/descriptions/genesys.desc
doc/sane-genesys.man: add full HP2400 support thanks a patch from
Alexey Osipov <simba@lerlan.ru>
2011-06-13 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys*.[ch] : rework of gl847 to reach 2400 dpi for
* backend/genesys*.[ch] : rework of gl847 to reach 2400 dpi for
LiDE 100 and 4800 dpi for LiDE 200
2011-06-10 Stéphane Voltz <stef.dev@free.fr>
@@ -644,11 +644,11 @@
USB autosuspend/power management and use power/control if available.
2011-03-18 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_low.c backend/genesys.c : rewrite big endian fixes
* backend/genesys_low.c backend/genesys.c : rewrite big endian fixes
for gl847/gl124 based scanners. Improve calibration cache file handling.
2011-03-17 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_low.c: big endian fixes for gl847/gl124 based
* backend/genesys_low.c: big endian fixes for gl847/gl124 based
scanners. Patch by Olaf Zimmermann <oez@pt.lu> .
2011-03-15 Stéphane Voltz <stef.dev@free.fr>
ChangeLogs/ChangeLog-1.0.24
+9 -9
View File
@@ -90,7 +90,7 @@
2013-08-07 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.[ch] backend/genesys_conv.c doc/sane-genesys.man
po/fr.po: add digital brightness and contrast options.
Add an option to set calibration cache file name.
Add an option to set calibration cache file name.
2013-08-07 Stéphane Voltz <stef.dev@free.fr>
* frontend/tstbackend.c: add argument to get verbose messages during
@@ -105,7 +105,7 @@
2013-08-02 Stéphane Voltz <stef.dev@free.fr>
* configure configure.in testsuite/Makefile.* testsuite/tools/*: add
a testsuite for sane-desc, then merge hwdb support for sane-desc by
a testsuite for sane-desc, then merge hwdb support for sane-desc by
Tom Gundersen <teg@jklm.no> .
2013-07-31 m. allan noah <kitno455 at gmail dot com>
@@ -291,7 +291,7 @@
2013-03-04 Oliver Schwartz <oliverschwartz@users.sf.net>
* backend/snapscan-options.c backend/snapscan-scsi.c backend/snapscan.c
backend/snapscan-sources.c backend/snapscan.h
backend/snapscan-sources.c backend/snapscan.h
doc/descriptions/snapscan.desc: Added support for Acer Scanwit 2720S
implemented by Andrew Goddbody.
@@ -424,9 +424,9 @@
has added support for IPv6
2013-01-10 Louis Lagendijk <louis dot lagendijk at gmail dot com>
* Added optional support in sanedi.c for systemd socket activation. This
will allow for using backend debugging using SANE_DEBUG_xxx to be used
for saned controlled scanning when using socket activation. When only the
* Added optional support in sanedi.c for systemd socket activation. This
will allow for using backend debugging using SANE_DEBUG_xxx to be used
for saned controlled scanning when using socket activation. When only the
socket is received we use the existing code path.
2013-01-08 Rolf Bensch <rolf at bensch hyphen online dot de>
@@ -486,7 +486,7 @@
speed up batch scans
2012-11-28 Paul Newall <quandry@ntlworld.com>
* backend/kodakaio.c backend/kodakaio.h backend/kodakaio.conf.in
* backend/kodakaio.c backend/kodakaio.h backend/kodakaio.conf.in
backend/Makefile.am backend/Makefile.in docs/descriptions/kodakaio.desc:
Use avahi instead of cups for network autodetection
@@ -512,7 +512,7 @@
without need for manual editing
* pixma.[ch] pixma_mp810.c pixma_mp150.c
Rewrite of button option handling. Button options can now be read
without triggering through the button-update option. Buton-update
without triggering through the button-update option. Buton-update
options is left for ease of use with xsane
Options are cached so that only when an option is read again all
options are re-read.
@@ -597,6 +597,6 @@
2012-08-26 m. allan noah <kitno455 at gmail dot com>
* ChangeLog*, configure*, Makefile.in, doc/desc/{kodakaio,kvs40xx}.desc:
Various updates related to starting 1.0.24git
Various updates related to starting 1.0.24git
Older entries can be found in ChangeLog-1.0.23.
ChangeLogs/ChangeLog-1.0.25
+3 -3
View File
@@ -8,7 +8,7 @@
* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.23
2015-06-22 Louis Lagendijk <louis dot lagendijk at gmail dot com>
* doc/saned.man: updated to clarify systemd integration and
* doc/saned.man: updated to clarify systemd integration and
configuration for thecase where saned is compiled with systemd
glue.
@@ -485,7 +485,7 @@
for autodetection in kodakaio so the detection of cups is no longer required.
2013-10-14 Paul Newall <quandry@ntlworld.com>
* backend/kodakaio.c: fix bug #314301,
* backend/kodakaio.c: fix bug #314301,
Segfault when unexpected data returned by avahi auto discovery.
2013-10-11 Rolf Bensch <rolf at bensch hyphen online dot de>
@@ -502,6 +502,6 @@
2013-09-30 m. allan noah <kitno455 at gmail dot com>
* ChangeLog*, configure*, doc/releases.txt:
Various updates related to starting 1.0.25git
Various updates related to starting 1.0.25git
Older entries can be found in ChangeLog-1.0.24.
ChangeLogs/ChangeLog-1.0.27
+236 -236
View File
File diff suppressed because it is too large Load Diff
ChangeLogs/ChangeLog-1.0.3
+93 -93
View File
@@ -7,40 +7,40 @@
* changed tools/sane-desc.el sane.gif->sane.png
2000-08-10 Henning Meier-Geinitz <hmg@gmx.de>
* backend/avision.c: Changed // comment to /* */. This broke
* backend/avision.c: Changed // comment to /* */. This broke
compilation on AIX cc, Irix cc and Sun cc.
2000-08-10 Rene Rebe <rene.rebe@myokay.net>
* backend/avision.h: some updates + cleanups
* backend/avision.c: use of DB () and sane_config_read ()
general cleanups (sorry for the big commit - I used Emacs auto-ident
for some regions ...)
2000-08-07 Henning Meier-Geinitz <hmg@gmx.de>
* README.irix: Removed text about library version problems.
* README.linux: Added comment about idescsi problems.
* ltmain.sh: Changed Irix library version system (from Oliver Rauch).
This should fix the library version problems under Irix.
* backend/Makefile.in: Added all files in lib/ to LIBLIB. This fixes
a bug concerning linking with external frontends.
2000-08-06 Henning Meier-Geinitz <hmg@gmx.de>
* backend/plustek.c: Removed "const" from function header. This fixes
a compilation problem on aix/cc.
* configure configure.in: Additional warnings are now disabled by
default for the 1.0.3 realease.
2000-08-06 Henning Meier-Geinitz <hmg@gmx.de>
* backend/hp4200.desc: Added description file for HP 4200 USB
scanner.
2000-08-05 Henning Meier-Geinitz <hmg@gmx.de>
* AUTHORS: Added link to PROJECTS.
* PROJECTS: Removed frontends that are included in the SANE
* PROJECTS: Removed frontends that are included in the SANE
distribution. Added frontends: sanecgi, scanadf. Removed backends
Kodak DS-20 (old camera, no specs available, not interested anymore),
Logitech (old handscanner, author not interested anymore). Added
@@ -78,24 +78,24 @@
2000-07-31 Henning Meier-Geinitz <hmg@gmx.de>
* backend/mustek.*: Update to Mustek backend 1.0-96. Fixed Problem
with detecting some three-pass scanners.
2000-07-31 Henning Meier-Geinitz <hmg@gmx.de>
* doc/sane.tex: Chapter 4 said, that this was standard version
0 (draft). Changed to 1 and removed "(draft)".
2000-07-31 Henning Meier-Geinitz <hmg@gmx.de>
* sanei/sanei_DomainOS.c sanei/sanei_ab306.c sanei/sanei_codec_ascii.c
sanei/sanei_codec_bin.c sanei/sanei_config.c sanei/sanei_config2.c
sanei/sanei_constrain_value.c sanei/sanei_init_debug.c
sanei/sanei_constrain_value.c sanei/sanei_init_debug.c
sanei/sanei_load_values.c sanei/sanei_net.c sanei/sanei_pa4s2.c
sanei/sanei_pio.c sanei/sanei_save_values.c sanei/sanei_scsi.c
sanei/sanei_thread.c sanei/sanei_wire.c sanei/test_wire.c: Changed
sanei/sanei_thread.c sanei/sanei_wire.c sanei/test_wire.c: Changed
include statements from #include <sane/...> to #include "sane...".
* PROBLEMS: Updated Mustek entry.
* TODO: Updated some entries that are done.
* backend/avision.c backend/plustek.c: Changed include statements from
#include <sane/...> to #include "sane...".
2000-07-30 Peter Kirchgessner <peter@kirchgessner.net>
* backend/hp.desc: Change Parallel to Parport in description
@@ -104,22 +104,22 @@
* changed all <config.h> to "config.h" in lib/*.c
2000-07-30 Henning Meier-Geinitz <hmg@gmx.de>
* backend/mustek.*: Update to Mustek backend 1.0-95. Changed from
wait() to waitpid() and removed unused code.
* configure configure.in backend/m3096g.c backend/sp15c.c: Reverted
the V_REV patch. V_REV should not be used in backends.
2000-07-30 Henning Meier-Geinitz <hmg@gmx.de>
* configure configure.in: Add V_REV to CPPFLAGS (only V_MAJOR and
* configure configure.in: Add V_REV to CPPFLAGS (only V_MAJOR and
V_MINOR were defined until now).
* doc/.cvsignore: Added sane-coolscan.5.
2000-07-29 Henning Meier-Geinitz <hmg@gmx.de>
* backend/sp15c.c backend/m3096g.c: Replace fgets with
sanei_config_read, return V_REV as part of version_code string
* backend/sp15c.c backend/m3096g.c: Replace fgets with
sanei_config_read, return V_REV as part of version_code string
(patch from Randolph Bentson).
2000-07-29 Chris Pinkham <cpinkham@infi.net>
@@ -131,14 +131,14 @@
* backend/GUIDE: Added some comments about portability and
documentation.
* backend/abaton.c backend/agfafocus.c backend/apple.c
* backend/abaton.c backend/agfafocus.c backend/apple.c
backend/canon.c backend/coolscan.c backend/dc210.c backend/dc25.c
backend/dll.c backend/dmc.c backend/microtek.c backend/microtek2.c
backend/microtek2.c backend/mustek_pp.c backend/net.c backend/pint.c
backend/pnm.c backend/qcam.c backend/ricoh.c backend/s9036.c
backend/sane_strstatus.c backend/sharp.c backend/snapscan.c
backend/sane_strstatus.c backend/sharp.c backend/snapscan.c
backend/st400.c backend/stubs.c backend/tamarack.c backend/v4l.c:
Changed include statements from #include <sane/...> to
Changed include statements from #include <sane/...> to
#include "sane...".
* backend/avision.c backend/dc25.c: Use DBG(0, ...) instead of
fprintf (stderr, ...)
@@ -154,7 +154,7 @@
* README: Added Link to coolscan manpage.
* backend/mustek.*: Update to Mustek backend 1.0-94. Fixed the
#include <sane/...> bug.
2000-07-29 Karl Heinz Kremer <khk@khk.net>
* backend/epson.c: Changed the include statements for SANE includes
@@ -183,9 +183,9 @@
backend/snapscan.desc backend/canon.desc backend/.cvsignore:
Added manpage for canon and snapscan backends. Added :interface
entry for canon.
* backend/canon-sane.c: Fixed possible segfault in
* backend/canon-sane.c: Fixed possible segfault in
sane_control_option() when info is 0.
2000-07-22 Petter Reinholdtsen <pere@td.org.uit.no>
* backend/v4l.c: Bugfix: Avoid crashing in
@@ -213,18 +213,18 @@
man sane-scsi
2000-07-25 Henning Meier-Geinitz <hmg@gmx.de>
* backend/snapscan.c: Use DBG(0, ...) instead of fprintf (stderr, ...)
* backend/snapscan.c: Use DBG(0, ...) instead of fprintf (stderr, ...)
* backend/abaton.c backend/agfafocus.c backend/apple.c backend/dc210.c
backend/dll.c backend/dmc.c backend/microtek2.c backend/pint.c
backend/qcam.c backend/ricoh.c backend/s9036.c backend/snapscan.c
backend/tamarack.c: Use sanei_config_read instead of fgets.
* backend/dc210.c backend/microtek.c backend/pnm.c: Added
* backend/dc210.c backend/microtek.c backend/pnm.c: Added
#include <sane/config.h>.
* backend/dc25.c backend/m3096.c backend/m3096g.c backend/sp15.c
backend/st400.c: Moved #include <sane/config.h> to the beginning.
* AUTHORS: Changed agfa to agfafocus.
2000-07-25 Peter Kirchgessner <peter@kirchgessner.net>
* backend/hp.c hp-scl.c hp-option.c hp-handle.c hp-accessor.c
@@ -232,14 +232,14 @@
2000-07-25 Henning Meier-Geinitz <hmg@gmx.de>
* configure.in configure include/sane/config.h.in
* configure.in configure include/sane/config.h.in
include/sane/sanei_backend.h: Moved test for u_int* to configure.
* include/sane/sanei_debug.h: Remove #warning (Irix compiler doesn't
like this)
* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
1.0-92. Changed linedistance correction for MFS-8000SP. Fixed
1.0-92. Changed linedistance correction for MFS-8000SP. Fixed
margin positions and removed warning for MFS 6000CX. Warning is
printed in debug level 0 again. Removed test for gamma length.
printed in debug level 0 again. Removed test for gamma length.
Fixed (partly) ADF handling. Man page update. More details in
mustek.CHANGES.
* NEWS: updated for new Mustek backend version.
@@ -251,12 +251,12 @@
2000-07-20 Abel Deuring <a.deuring@satzbau-gmbh.de>
* backend/sharp.c: removed fgets-call + minor bugfix
* backend/sharp.desc: added entry ":manpage"
* sanei/sanei_scsi.c: added missing dummy function
* sanei/sanei_scsi.c: added missing dummy function
sanei_scsi_req_flush_all_extended
2000-07-18 Henning Meier-Geinitz <hmg@gmx.de>
* configure.in configure: Fixed --enable-warnings to work as
* configure.in configure: Fixed --enable-warnings to work as
advertised.
2000-07-18 Petter Reinholdtsen <pere@td.org.uit.no>
@@ -268,16 +268,16 @@
vsyslog(). Implement replacement functions.
2000-07-17 Henning Meier-Geinitz <hmg@gmx.de>
* backend/snapscan.c backend/snapscan-scsi.c: Replace C++ comment
* backend/snapscan.c backend/snapscan-scsi.c: Replace C++ comment
with C comment.
2000-07-17 Henning Meier-Geinitz <hmg@gmx.de>
* include/sane/sanei_backend.h: Replace C++ comment with C comment.
2000-07-17 Henning Meier-Geinitz <hmg@gmx.de>
* backend/musteka4s2.desc: Removed. Now that the mustek_pp
backend is part of SANE musteka4s2 is no longer neccessary.
If somebody really wants to use the old musteka4s2 sources
@@ -298,12 +298,12 @@
* backend/epson.desc: updated version number
2000-07-15 Henning Meier-Geinitz <hmg@gmx.de>
* backend/dc210.c: Replaced fprintf (stderr, ...) by DBG ().
2000-07-15 Henning Meier-Geinitz <hmg@gmx.de>
* doc/Makefile.in doc/sane-dc210.man doc/sane-v4l.man
* doc/Makefile.in doc/sane-dc210.man doc/sane-v4l.man
doc/.cvsignore: Added manpages for dc210 and v4l. These
are just standard manpages. Please check and update them.
@@ -313,7 +313,7 @@
* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
1.0-90. Fixed linedistance-handling for Paragon 8000SP. Fixed
mustek.conf port entry. Updated man page (parallel port
mustek.conf port entry. Updated man page (parallel port
scanners and 600 II N).
* NEWS: Updated (mustek backend version 1.0-90)
@@ -323,11 +323,11 @@
* doc/.cvsignore: added sane-mustek_pp.5, sane-plustek.5 and
sane-st400.5
2000-07-15 Andreas Rick <andreas.rick@free.fr>
* backend/coolscan.c: added missing initialization in
coolscan_read_data_block()
* backend/coolscan.c: added missing initialization in
coolscan_read_data_block()
2000-07-13 Petter Reinholdtsen <pere@td.org.uit.no>
@@ -358,7 +358,7 @@
* frontend/scanimage.c, doc/scanimage.man: Support for
environment variable SANE_DEFAULT_DEVICE.
2000-07-11 Ingo Wilken <Ingo.Wilken@informatik.uni-oldenburg.de>
* backend/st400.c, backend/st400.conf, backend/st400.h,
@@ -366,7 +366,7 @@
* backend/st400.desc: updated information
* README, backend/Makefile.in, doc/Makefile.in: added st400 backend
* AUTHORS: added myself as maintainer of st400 backend
2000-07-09 Peter Kirchgessner <peter@kirchgessner.net>
* doc/sane-hp.man: Updated manual page (scantype --> scan source)
@@ -394,10 +394,10 @@
* backend/plustek.desc: updated description
* backend/plustek.c backend/plustek.h backend/plustek-share.h
backend/plustek.conf: added Plustek backend code
* backend/plustek.c backend/plustek.h backend/plustek-share.h
backend/plustek.conf: added Plustek backend code
* backend/Makefile.in doc/Makefile.in backend/dll.conf:
* backend/Makefile.in doc/Makefile.in backend/dll.conf:
added plustek entries
* doc/sane-plustek.man: added manpage for Plustek backend
@@ -442,7 +442,7 @@
2000-06-30 Henning Meier-Geinitz <hmg@gmx.de>
* backend/mustek.* Update to Mustek backend 1.0-89. Fixed "scan
* backend/mustek.* Update to Mustek backend 1.0-89. Fixed "scan
slider doesn't return to start" bug. Details in
backend/mustek.CHANGES.
@@ -463,12 +463,12 @@
* backend/sp15.desc backend/dc25.desc backend/m3096g.desc: Added
:interface entries.
2000-06-28 Oliver Rauch
* Updated umax backend to version 1.0.21
take a look at backend/umax.CHANGES for details
- updated umax.desc, umax manpage
2000-06-28 Abel Deuring
* backend/sharp.esc: added "interface" entries
@@ -486,31 +486,31 @@
Abel Deuring)
2000-06-26 Henning Meier-Geinitz <hmg@gmx.de>
* backend/musteka4s2.desc: Added all more scanners and
:interface entries
* backend/sagitta.desc: Removed on behalf of the author. Nobody
has showed interest in this very old (and rare) scanner over
the years. It's difficult to keep it up-to-date because a kernel
module is neccessary. Nobody volunteered to take over
module is neccessary. Nobody volunteered to take over
maintainership.
* backend/tamarack.c: Changed all fprintf to DBG calls.
2000-06-26 Abel Deuring <a.deuring@satzbau-gmbh.de>
* sanei/sanei_scsi.c and include/sanei/sanei_scsi.h:
new functions sanei_scsi_cmd2 and sanei_scsi_req_enter2
* sanei/sanei_scsi.c and include/sanei/sanei_scsi.h:
new functions sanei_scsi_cmd2 and sanei_scsi_req_enter2
for proper handling of "unusual" SCSI commands lengths
* backend/canon-scsi.c: call sanei_scsi_cmd2, where necessary
2000-06-25 René Rebe <rene.rebe@myokay.net>
* backend/avision.c: fixed sane_close () bug
* backend/avision.desc: added some more scanners
2000-06-25 Henning Meier-Geinitz <hmg@gmx.de>
* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
1.0-87. Fixed gamma correction for 1200 A3 Pro. Fixed dependancy
of mustek.h on sane-backends.h. Fixed debug output bug in
of mustek.h on sane-backends.h. Fixed debug output bug in
fix_linedistance_se. Updated documentation and mustek.conf.
* README: Added v4l and fixed typo.
@@ -521,7 +521,7 @@
2000-06-25 Henning Meier-Geinitz <hmg@gmx.de>
* doc/Makefile.in doc/sane-s9036.man doc/sane-tamarack.man
* doc/Makefile.in doc/sane-s9036.man doc/sane-tamarack.man
doc/sane-ricoh.man doc/sane-avision.man doc/xcam.man .cvsignore:
Added manpages for these backends and xcam.
@@ -559,27 +559,27 @@
2000-06-22 Henning Meier-Geinitz <hmg@gmx.de>
* include/sane/sanei_pa4s2.h sanei/sanei_pa4s2.c Makefile.in
* include/sane/sanei_pa4s2.h sanei/sanei_pa4s2.c Makefile.in
backend/Makefile.in sanei/Makefile.in: Added interface for
Mustek parallel port scanners (from Jochen Eisinger
Mustek parallel port scanners (from Jochen Eisinger
<jochen.eisinger@gmx.net>). This will be used by the Mustek
parallel port backend mustek_pp (coming soon).
* tools/sane-desc.el backend/template.desc.: Added support for
"interface" column in sane-desc.el. The new keyword is
"interface" column in sane-desc.el. The new keyword is
":interface", examples in "template.desc.". All maintainers
should update their *.desc files.
* backend/mustek.desc abaton.desc agfafocus.desc apple.desc
* backend/mustek.desc abaton.desc agfafocus.desc apple.desc
dc210.desc dmc.desc qcam.desc ricoh.desc s9036.desc snapscan.desc
tamarack.desc: added interface entry for the Mustek and
tamarack.desc: added interface entry for the Mustek and
unmaintained backends.
* backend/abaton.c apple.c qcam.c tamarack.c: fixed sane_close ()
bug for the unmaintained backends.
2000-06-18 Henning Meier-Geinitz <hmg@gmx.de>
* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
1.0-86. Added support for Mustek Paragon 1200 A3 pro (1, 8, and 24
bit/pixel; calibration doesn't work yet). Removed some remainings
@@ -597,11 +597,11 @@
handling.
2000-05-21 Henning Meier-Geinitz <hmg@gmx.de>
* backend/mustek.*: Update to Mustek backend 1.0-85. Added double
buffering. This may improve scan performance a bit. Removed
dead code (in dev_read_start). Changed linedistance correction
handling. Paragon 12000 SP color mode might work now with all
dead code (in dev_read_start). Changed linedistance correction
handling. Paragon 12000 SP color mode might work now with all
firmware versions. Details in backend/mustek.CHANGES.
2000-05-27 Karl Heinz Kremer <khk@khk.net>
@@ -619,14 +619,14 @@
2000-05-21 Henning Meier-Geinitz <hmg@gmx.de>
* README: Added quick install. Removed list of supported platforms
because it is unknown how accurate it is at the moment. Added
because it is unknown how accurate it is at the moment. Added
description for --enable-scsibuffersize (partly from Abel
Deuring). Removed operating system specific information. See
README.* files instead. Added comment to read the PROBLEMS file.
Added/changed list of available documentation. Added comment on
Added/changed list of available documentation. Added comment on
possible causes for the frontends not detecting scanners. Added
comment on tools directory. Headings should be easier to find now.
* README.aix: New file. Extracted from README.
* README.hp-ux: New file. Extracted from README.
@@ -634,9 +634,9 @@
* README.linux: New file. What is needed to get SCSI scanners to
work under Linux. Workaround for Adaptec 1542 users (from Abel
Deuring)
2000-05-18 Henning Meier-Geinitz <hmg@gmx.de>
* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
1.0-82. Added shrinked image fix to ScanExpress 12000SP models
<= v2.0. Fixed remaining sane_cancel problems (in non_blocking
@@ -646,7 +646,7 @@
details.
* doc/.cvsignore: Added missing sane-sharp.5
2000-05-07 Henning Meier-Geinitz <hmg@gmx.de>
* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
@@ -656,7 +656,7 @@
source selection now shows only the options currently available.
Fixed a bug concerning the ADF handling. sane_init () now uses
sanei_config_read () and sanei_config_get_string () instead of
its own functions. Man page and .desc update. Look at
its own functions. Man page and .desc update. Look at
backend/mustek.CHANGES for more details.
2000-04-27 Karl Heinz Kremer <khk@khk.net>
@@ -683,42 +683,42 @@
mustek.conf template to more reasonable defaults. Lots of
small fixes and more complete debugging output. Look at
backend/mustek.CHANGES for more details.
2000-04-15 Andreas Rick <andreas.rick@free.fr>
* backend/coolscan.* Update coolscan backend to version 0.4.3.
This version includes support for the newer Nikon Coolscan
models LS-30 and LS-2000. Dustremoval is not yet included.
2000-04-09 Henning Meier-Geinitz <hmg@gmx.de>
* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
1.0-79. Changed version system. Linedistance correction for
the 600 II N is fixed. Added output of scanning time. Rewrite
of the resolution encoding for the 3-pass scanners. Look at
backend/mustek.CHANGES for details.
2000-04-05 Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
* Updated umax backend to version 1.0.2-build-20
take a look at backend/umax.CHANGES for details
2000-04-05 Henning Meier-Geinitz <hmg@gmx.de>
* frontend/xscanimage.c, frontend/preview.c: Fixed a small bug
* frontend/xscanimage.c, frontend/preview.c: Fixed a small bug
concerning 3-pass scanners. gdk_input_add() was called three times
without a preceding gdk_input_remove().
* frontend/scanimage.c: Fixed a bug where the scan was cancelled
after a test for low mem even if enough memory is available. This
probably only affected 3-pass scanners.
2000-04-02 Henning Meier-Geinitz <hmg@gmx.de>
* backend/mustek.*: Update to Mustek backend 0.78. Fixed several
small bugs and spelling errors. Adjusted scanner names to Mustek
style. Inquiry is even more verbose now. Look at
backend/mustek.CHANGES for details.
2000-03-27 Karl Heinz Kremer <khk@khk.net>
* backend/epson.c backend/epson.desc: Removed
status request for push button. This caused an
@@ -737,7 +737,7 @@
problems with TPU and occasional crashes during startup.
Added D1 level for Perfection 610.
Added first version of support for set threshold and set
zoom.
zoom.
2000-03-19 Henning Meier-Geinitz <hmg@gmx.de>
@@ -755,18 +755,18 @@
* backend/mustek.desc: Added link to backend homepage. Added all
the different scanner names used for the same model. Added Trust
scanners known to work. Removed firmware versions and scanner ids.
scanners known to work. Removed firmware versions and scanner ids.
* backend/mustek.CHANGES: New file. More detailed changes for the
Mustek backend.
* doc/sane-mustek.man: Documentation for the 600 II N linedistance
options. Added warning from PROBLEMS. Added link to backend homepage.
Changed supported scanners list (see mustek.desc). Added more bug
entries.
* AUTHORS: Added new maintainer and email address
2000-03-18 Petter Reinholdtsen <pere@td.org.uit.no>
* backend/Makefile.in tools/libtool-get-dll-ext: New script to
@@ -779,7 +779,7 @@
defined(__linux__).
2000-03-14 Abel Deuring <a.deuring@satzbau-gmbh.de>
* new version of ths Sharp backend (0.31): added support for the
JX350 (Thanks to Shuhei Tomita for providing the patch)
@@ -788,4 +788,4 @@
* Makefile.in (lsm) sane.lsm sane-1.0.1.lsm: New target to
generate Linux Software Map (LSM) entry from template. Remove old
file.
ChangeLogs/ChangeLog-1.0.4
+65 -65
View File
@@ -1,11 +1,11 @@
************************ Release of sane-backends 1.0.4 **********************
2000-12-22 Henning Meier-Geinitz <hmg@gmx.de>
* configure configure.in: Changed version to 1.0.4 and package to
* configure configure.in: Changed version to 1.0.4 and package to
sane-backends (from Oliver Rauch <Oliver.Rauch@Wolfsburg.DE).
* sane.lsm Removed (renamed to sane-backends.lsm).
* sane-backends.lsm New file. Package name is sane-backends instead
* sane-backends.lsm New file. Package name is sane-backends instead
of sane and added additional maintainer: Oliver Rauch (from
Oliver Rauch <Oliver.Rauch@Wolfsburg.DE).
@@ -44,7 +44,7 @@
2000-12-12 Henning Meier-Geinitz <hmg@gmx.de>
* NEWS: Updated/corrected version numbers of backends.
2000-12-10 Henning Meier-Geinitz <hmg@gmx.de>
* doc/sane-scsi.man: Small changes/updates concerning Linux
@@ -72,12 +72,12 @@
Add HP ScanJet 6390C to list of supported scanners
2000-12-07 Henning Meier-Geinitz <hmg@gmx.de>
* TODO: Updated. Removed entries about plustek comment problembelm
and libsane.la. Added entry about disabling local scanning.
2000-12-07 Gerhard Jaeger <g.jaeger@earthling.net>
* backend/plustek-share.h backend/plustek.h backend/plustek.c
removed warning conditions
fixed a bug that causes wrong frontend displays
@@ -91,9 +91,9 @@
Fixed problem with lamp control of SE scanners and reduced
length of scan area for Paragon 1200 SP PRO. Removed warning for
this scanner. Increased version number.
2000-12-05 Henning Meier-Geinitz <hmg@gmx.de>
* TODO: Updated. Added point about plustek-share.h using c++ comment
and reminder to check config.in.h. Removed entriy about as6e.c stat
result check.
@@ -102,7 +102,7 @@
of stat. Add GPL header.
2000-12-05 Gerhard Jaeger <g.jaeger@earthling.net>
* backend/plustek-share.h
cleanup
@@ -115,7 +115,7 @@
* TODO: Updated. Added entries about as6e stat problems and addition to
sanei_scsi.c from FreeBSD ports.
************************* snapshot-2000-12-04 *******************************
2000-12-04 Peter Kirchgessner <peter@kirchgessner.net>
@@ -135,7 +135,7 @@
* backend/epson.*: Version 0.1.38
Removed changes regarding 12/14 bit support because of SANE
feature freeze for 1.0.4.
feature freeze for 1.0.4.
The following fixes are in the software compared to the version
prior to the feature freeze:
- refresh UI after a change in the scan mode setting (was not updated
@@ -143,7 +143,7 @@
- Read values for "line distance" from the scanner instead of using
hardcoded values. This makes sure the backend always uses the correct
values regardless of firmware version.
- Fixed an "off-by-one" error in the color reordering routine that
- Fixed an "off-by-one" error in the color reordering routine that
caused weird artifacts in some instances.
2000-12-03 Karl Heinz Kremer <khk@khk.net>
@@ -152,11 +152,11 @@
2000-12-02 Karl Heinz Kremer <khk@khk.net>
* backend/epson.*: Read information about optical resolution
* backend/epson.*: Read information about optical resolution
and line distance from scanner instead of hardcoded values.
Add support for color depth > 8 bits per channel.
Add support for color depth > 8 bits per channel.
(can use 12, 14 and 16 bits per channel)
EPSON backend is now version 0.36
EPSON backend is now version 0.36
2000-11-30 Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
@@ -169,11 +169,11 @@
2000-11-30 Henning Meier-Geinitz <hmg@gmx.de>
* README.irix: Removed. Problem with libjpeg is solved.
* TODO: Updated. Removed hpoj addition. Added snapscan link. Added
* TODO: Updated. Removed hpoj addition. Added snapscan link. Added
entry about net backend segfaulting if using net:localhost. Removed
artec O_SYNC problem. Removed Irix jpeg problem. Removed PTAL
artec O_SYNC problem. Removed Irix jpeg problem. Removed PTAL
addition.
* doc/saned.man: Added paragraph about xinetd (from Matt Mozur
* doc/saned.man: Added paragraph about xinetd (from Matt Mozur
<matt.mozur@sourwood.net>). Removed links to backends, added
sane-"backendname" instead.
* doc/sane-net.man: Added comment about segfaults if scanning
@@ -181,7 +181,7 @@
* sanei/sanei_scsi.c: Added missing DBG_INIT (from FreeBSD ports).
2000-11-30 Gerhard Jaeger <g.jaeger@earthling.net>
* backend/plustek.c backend/plustek.desc backend/plustek-share.h
backend/plustek.h doc/sane-plustek.man:
changed to version 0.38 - document update, minor bugfixes
@@ -226,12 +226,12 @@
1.0-100. Added option fast-preview that tries to use the fastest
mode available for preview. This is supported for the 3-pass
scanners (was option "preview in gray") and some of the
ScanExpress scanners (6000 SP, 12000 SP Plus). Use #include
ScanExpress scanners (6000 SP, 12000 SP Plus). Use #include
"../include/sane/...". Put option force-wait into mustek.conf
(disabled). Removed block mode for Paragon 6000 SP and 8000 SP.
(disabled). Removed block mode for Paragon 6000 SP and 8000 SP.
Code cleanup. More debug output. Details in backend/mustek.CHANGES.
* doc/.cvsignore: Added sane-as6e.5 and sane-nec.5.
2000-11-26 Peter Kirchgessner <peter@kirchgessner.net>
* backend/hp.desc, doc/sane-hp.man
@@ -243,16 +243,16 @@
2000-11-25 Henning Meier-Geinitz <hmg@gmx.de>
* configure configure.in acinclude.m4 aclocal.m4
include/sane/config.h.in: Added test for PTAL library and headers
(patch from David Paschal <paschal@rcsis.com>). Some reformating of
* configure configure.in acinclude.m4 aclocal.m4
include/sane/config.h.in: Added test for PTAL library and headers
(patch from David Paschal <paschal@rcsis.com>). Some reformating of
the output of configure --help.
* backend/GUIDE: Updated entry about #include.
2000-11-24 Henning Meier-Geinitz <hmg@gmx.de>
* AUTHORS: Removed authors of xscanimage and xcam (now in
* AUTHORS: Removed authors of xscanimage and xcam (now in
sane-frontends).
* README.unixware2, README.unixware7: X-frontends are no longer
included. Removed comments and sourcecode of "rev" (not supported/used
@@ -296,7 +296,7 @@
* removed gimp and gtk parts from include/sane/config.h.in
* removed gtk test from aclocal.m4
* removed xcam.c xscanimage.c sane-style.rc progress.c progress.h
preview.c preview.h preferences.c preferences.h gtkglue.c gtkglue.h
preview.c preview.h preferences.c preferences.h gtkglue.c gtkglue.h
from frontend/
* removed parts for xcam and xscanimage from frontend/Makefile.in,
configure.in and updated confiugre
@@ -309,14 +309,14 @@
bug (from Peter Kirchgessner).
* TODO: Removed entry about shared libs not working on AIX. Added entry
about PTAL checks. Removed entry about DBG and microtek2. Added entry
about dc210 and jpeg functions. Added entry about using strchr()
about dc210 and jpeg functions. Added entry about using strchr()
instead of index().
* sane.lsm: Added NEC.
* backend/microtek2.c: (from karsten.festag@t-online.de (Karsten
Festag)) Use DBG instead of printf/fprintf. Use
Festag)) Use DBG instead of printf/fprintf. Use
#include "../sane/include/..." instead of #include "sane/...". Fixed
warnings.
warnings.
2000-11-23 Karl Heinz Kremer <khk@khk.net>
* backend/epson.c: Display "Set Focus" control only for scanners that
@@ -333,11 +333,11 @@
2000-11-21 Abel Deuring <a.deuring@satzbau-gmbh.de>
* backend/sharp.c, backend/sharp.desc, doc/sharp.man: Support
for JX320 added
for JX320 added
2000-11-21 Henning Meier-Geinitz <hmg@gmx.de>
* AUTHORS: Added FUKUDA Kazuya for the nec Backend. Used spaces instead
* AUTHORS: Added FUKUDA Kazuya for the nec Backend. Used spaces instead
of tabs.
* PROJECTS: Removed entry about NEC. Added/updated entries about Mustek
USB scanners.
@@ -345,11 +345,11 @@
* TODO: Removed entries about sanei_authorize and plain text passwords.
* backend/Makefile.in backend/dll.conf backend/nec.conf backend/nec.c
backend/nec.desc backend/nec.h doc/Makefile.in doc/sane-nec.man:
Added nec backend for the NEC scanners PC-IN500/4C (from Kazuya Fukuda
Added nec backend for the NEC scanners PC-IN500/4C (from Kazuya Fukuda
<fukuda@pjs.nevt.nec.co.jp>)
2000-11-20 Henning Meier-Geinitz <hmg@gmx.de>
* AUTHORS: Added Eugene S. Weiss.
* PROJECTS: Removed Artec as6e backend.
* README: Added link to man sane-as6e.5.
@@ -360,7 +360,7 @@
* backend/as6e.c backend/as6e.h backend/as6e.desc doc/sane-as6e.man:
Added backend for Artec AS6E parallel port scanner (from Eugene S.
Weiss <yossarian@users.sourceforge.net>).
2000-11-20 Jochen Eisinger <jochen.eisinger@gmx.net>
* configure configure.in: Added test for /dev/urandom and
@@ -422,13 +422,13 @@
* backend/avision.[c,h]: some fixes for brightness and contrast via
the gamma-table. New config-option to force the backend to use DIN A4
("option force-a4"). Clean up.
2000-11-14 Rene Rebe <rene.rebe@gmx.net>
* backend/avision.[h,c]: Added gamma table support in hardware.
Brightness and contrast emulation via the hardware gamma table.
Code cleanup.
* AUTHORS: Changed my e-mail address.
2000-11-13 Henning Meier-Geinitz <hmg@gmx.de>
* Makefile.in: Install sane.h and saneopts.h only.
@@ -456,21 +456,21 @@
* README: Removed X-frontends. Point to sane-frontends and website.
Some reformatting.
* TODO: Updated concerning frontends split.
* PROJECTS: Removed entries about frontends (now in
* PROJECTS: Removed entries about frontends (now in
sane-frontends/README)
* PROBLEMS: Removed entries about frontends (now in
sane-frontends/PROBLEMS)
2000-11-10 Henning Meier-Geinitz <hmg@gmx.de>
* sanei/sanei_constrain_value.c: If constraint_type is
SANE_CONSTRAINT_RANGE and quantization is used, the results may
be outside the limits of the range because quantization uses the
orginal value. Fixed by doing quantization with the already
orginal value. Fixed by doing quantization with the already
checked value.
2000-11-10 Gerhard Jaeger <g.jaeger@earthling.net>
* backend/plustek.c backend/plustek.desc backend/plustek-share.h
backend/plustek.h doc/sane-plustek.man:
updated to version 0.37 - support for xsane, new models
@@ -480,28 +480,28 @@
* TODO: Updated. Added entries for viceo backend and addition to hp
backend. Updated entries about the include issue. Added point about
additional options for pnm backend, install problem of libsane.la,
and some build problems and the --without-x problem. Some more
details for detecting older SANE versions.
additional options for pnm backend, install problem of libsane.la,
and some build problems and the --without-x problem. Some more
details for detecting older SANE versions.
* LEVEL2: Added entry about sending messages from backend to frontend.
Removed entry about image polarity.
* backend/mustek.c backend/mustek.h backend/mustek.CHANGES
* backend/mustek.c backend/mustek.h backend/mustek.CHANGES
backend/mustek.desc: Update to Mustek backend 1.0-99. Better
transparency adapter support for ScanExpress scanners. Changed
color support for ScanExpress scanners (faster at some resolutions
now). Paragon 1200 SP color mode should work now without garbage at
the end of an image. Some bugfixes. Details in
the end of an image. Some bugfixes. Details in
backend/mustek.CHANGES.
2000-11-08 Jochen Eisinger <jochen.eisinger@gmx.net>
* include/sane/sanei_debug.h: fixed typo
2000-10-30 Henning Meier-Geinitz <hmg@gmx.de>
* TODO: Updated. Added points about --without-x and the
* TODO: Updated. Added points about --without-x and the
#include <sane...> stuff. Added xcam problem. Changed entry for
Relisys scanner.
@@ -514,7 +514,7 @@
2000-10-29 Henning Meier-Geinitz <hmg@gmx.de>
* TODO: Updated.
2000-10-23 Peter Kirchgessner <peter@kirchgessner.net>
*backend/hp-accessor.c hp-device.c hp-handle.c hp-hpmem.c hp.h hp.c
@@ -532,10 +532,10 @@
frontend/saned.c: removed vararg macros
2000-10-17 Henning Meier-Geinitz <hmg@gmx.de>
* doc/sane.tex: Added paragraph about image polarity as discussed
on sane-devel. This is the version from Nick Lamb.
2000-10-15 Jochen Eisinger <jochen.eisinger@gmx.net>
* include/sane/sanei_debug.h: sanei_debug_init was only declared
@@ -565,7 +565,7 @@
anymore). Fix sane_cancel for Paragon series II scanners. Fix
halftone and grain for Paragon series II scanners. Backtracking is
used automaticly by all scanners now. Some safety checks, code
cleanup and more debug output. Details are in
cleanup and more debug output. Details are in
backend/mustek.CHANGES.
2000-10-02 Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
@@ -592,7 +592,7 @@
warnings. Added DBG lines for every SANE API call.
* TODO: Added entries about the backend:devicename issue. Add a
comment about fronends not to crash when length is -1. Added entry
about sane-pie. Added point about fronends not checking if too
about sane-pie. Added point about fronends not checking if too
much data is delivered with sane_read.
* PROJECTS: Added entry about sane-pie.
@@ -623,11 +623,11 @@
about alpha channel (was added to LEVEL2 file).
* LEVEL2: Add point about image data polarity.
* frontend/scanimage.c: Removed some warnings.
2000-09-19 Gerhard Jaeger <g.jaeger@earthling.net>
* backend/plustek.desc doc/sane-plustek.man:
updated information about supported scanners
updated information about supported scanners
2000-09-18 Henning Meier-Geinitz <hmg@gmx.de>
@@ -646,9 +646,9 @@
* backend/v4l.c: Remove X11 dependency.
2000-09-17 Henning Meier-Geinitz <hmg@gmx.de>
* frontend/xscanimage.c: Fixed gtk_main_quit bug (based on patch
from <moloch@nikocity.de>). An error message was printed when
from <moloch@nikocity.de>). An error message was printed when
no sane device was found.
2000-09-17 Petter Reinholdtsen <pere@td.org.uit.no>
@@ -667,7 +667,7 @@
problems. Some other minor changes.
2000-09-15 Gerhard Jaeger <g.jaeger@earthling.net>
* backend/plustek.c
added some code to support timing measurement in debug sessions
@@ -700,14 +700,14 @@
2000-08-24 Gerhard Jaeger <g.jaeger@earthling.net>
* Updated plustek backend to support multiple devices and 12bit color-depth
affected files: backend/plustek.c backend/plustek.h
affected files: backend/plustek.c backend/plustek.h
backend/plustek-share.h backend/plustek.conf
* backend/plustek.desc: updated information about supported scanner
* doc/sane-plustek.man: updated manpage according to the changes
2000-08-23 Abel Deuring <a.deuring@satzbau-gmbh.de>
* sanei/sanei_scsi.c: Second attempt to fix the errno bug
in the Linux command queue handling.
in the Linux command queue handling.
2000-08-19 Henning Meier-Geinitz <hmg@gmx.de>
@@ -715,13 +715,13 @@
* sanei/sanei_ab306.c: Removed some comiler warnings.
* doc/sane.tex: Set \date to the date of the last change (not
the date of running latex (\today))
* frontend/xscanimage.c: Fixed image size overrun (>ca. 400 MB).
* frontend/xscanimage.c: Fixed image size overrun (>ca. 400 MB).
Removed some compiler warnings.
2000-08-15 Henning Meier-Geinitz <hmg@gmx.de>
* configure configure.in: Default to --enable-warnings again.
2000-08-15 Jochen Eisinger <jochen.eisinger@gmx.net>
* backend/mustek_pp.c: fixed bug in config_ccd_1013 that prevents
ChangeLogs/ChangeLog-1.0.5
+67 -67
View File
@@ -22,7 +22,7 @@
* backend/umax*: bugfixes:
* bugfix for DOR:
- bottom-right edge keeps in position if possible when DOR is switched on
* bugfix for Astra 610S color mode:
- scale_y is set to 0.5 if y_resolutions is smaller than optical_res/2
this does fix the color scan problems for Astra 610S.
@@ -33,7 +33,7 @@
* backend/dc25.c - Backed out the previously added mkdtemp()
patch, as mkdtemp is not available on all platforms.
* TODO: Removed entry about dc25 bug
2001-06-20 Henning Meier-Geinitz <henning@meier-geinitz.de>
* TODO: Updated documentation entries. Added compilation bug in dc25.c.
@@ -74,7 +74,7 @@
* TODO: Added link to libieee1284.
2001-06-13 Karl Heinz Kremer <khk@khk.net>
* backend/epson.desc: Added GT-9500 (same scanner as Expression 636)
* backend/epson.c: Finally updated version #
@@ -92,16 +92,16 @@
2001-06-11 Henning Meier-Geinitz <henning@meier-geinitz.de>
* tools/umax_pp.c: Also use sanei_umax_pp_SetLamp() (patch from
* tools/umax_pp.c: Also use sanei_umax_pp_SetLamp() (patch from
Tim Waugh <twaugh@redhat.com>).
2001-06-11 Stéphane Voltz <svoltz@wanadoo.fr>
* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.c:
* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.c:
make use of PPGETMODES only when available in ppdev.h. Corrected OS/2
typo in Outb() and rename sanei_umax_pp_Lamp() to
typo in Outb() and rename sanei_umax_pp_Lamp() to
sanei_umax_pp_SetLamp().
2001-06-05 Peter Fales <peter@fales.com>
@@ -191,7 +191,7 @@
2001-06-06 Stéphane Voltz <svoltz@wanadoo.fr>
* backend/umax_pp_low.c: OS/2 compile fixes (again). Backend
* backend/umax_pp_low.c: OS/2 compile fixes (again). Backend
successfully built on Warp with EMX 0.9d.
2001-06-06 Stéphane Voltz <svoltz@wanadoo.fr>
@@ -221,7 +221,7 @@
* frontend/.cvsignore: Added test.
* frontend/saned.c: Increase timeout to one hour.
* backend/coolscan.c: Declared all internal functions static.
* tools/Makefile.in: Fixed typo that prevented make from removing
* tools/Makefile.in: Fixed typo that prevented make from removing
mustek600iin-off.
* sanei/sanei_scsi.c: Fixed some small bugs concerning error reporting.
* frontend/scanimage.c: Fixed small bug in output for batch mode.
@@ -252,9 +252,9 @@
* backend/mustek.c: Added some debug messages.
* backend/net.c: Fixed yet another segfault. Added debug messages.
* frontend/scanimage.c doc/scanimage.man: Added more options for
batch-scanning (patch from Caskey Dickson
batch-scanning (patch from Caskey Dickson
<caskey-lists-sane-devel@technocage.com>).
2001-06-02 Chris Pinkham <cpinkham@infi.net>
* backend/artec.desc: updated version number to match artec.c.
@@ -276,7 +276,7 @@
Removed references to sharp backend (grep for "JX"). Check for
HAVE_SYS_SHM_H before including sys/shm.h and disable shared
memory support if necessary. Free devlist allocated in
sane_get_devices() in sane_exit() resolution setting bug fixed
sane_get_devices() in sane_exit() resolution setting bug fixed
(PC-IN500/4C 10dpi step). Removed resolution list.
2001-06-02 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
@@ -298,11 +298,11 @@
* backend/mustek.c: Updated some comments.
* TODO: Removed the entry about the config_line[len-1] bug.
* configure configure.in include/sane/config.h.in backend/qcam.c:
Check for struct flock and define it if necessary.
Check for struct flock and define it if necessary.
* tools/Makefile.in: Make sure that backend/umax_pp_low.o exists
when umax_pp.o is linked.
* backend/bh.c backend/m3096g.c backend/sp15c.c: Fixed
config_line[len-1] bug which could generate an access violation
* backend/bh.c backend/m3096g.c backend/sp15c.c: Fixed
config_line[len-1] bug which could generate an access violation
if len==0.
* lib/alloca.c lib/getnev.c lib/getopt.c lib/getopt1.c
lib/isfdtype.c lib/md5.c lib sigprocmask.c lib/snprintf.c lib
@@ -310,7 +310,7 @@
Used #include "../include/sane/config.h".
* sanei/sanei_scsi.c: Fixed compilation issue for OS/2 in
sanei_scsi_find_devices.
--- cvs snapshot-2001-05-30 ---
2001-05-30 Marian Eichholz <marian@freenet-ag.de>
@@ -330,7 +330,7 @@
* tools/Makefile.in: Fixed umax_pp compilation problem with Solaris
and other operating systems.
2001-05-29 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/canon.conf doc/sane-canon.man: Added config file and some
@@ -340,8 +340,8 @@
2001-05-29 Peter Fales <peter@fales.com>
* backend/dc240.c - Fixed a fairly obscure problem that can result in
core dump. (Deleting pictures with gphoto, then launching
* backend/dc240.c - Fixed a fairly obscure problem that can result in
core dump. (Deleting pictures with gphoto, then launching
xscanimage without power cycling the camera left bad data in the
camera status table.)
@@ -402,7 +402,7 @@
* TODO: Updated entry on library search path, sanei API
documentation and sane_init() return value.
* Makefile.in:New target 'libcheck' making sure libraries export
only sane_* and sanei_* symbols.
@@ -410,9 +410,9 @@
* TODO: Removed snapscan and microtek2 updates. Removed status change of
as6e. Removed True64 Unix and HP/UX compilation problems. Added entry
about exporting symbols. Reformatted some entries.
about exporting symbols. Reformatted some entries.
* backend/microtek2.c backend/microtek2.desc backend/microtek2.h:
Updated to version 0.9 (from Karsten Festag
Updated to version 0.9 (from Karsten Festag
<karsten.festag@t-online.de>).
* doc/sane-snapscan.man: Added new scanners and authors.
* AUTHORS: Added Sebastien Sable and Henrik Johansson.
@@ -429,7 +429,7 @@
* backend/sm3600.desc: Changed status to new.
* backend/as6e.desc: Changed status to alpha because backend
isn't new any more.
* acinclude.m4 aclocal.m4 configure configure.in
* acinclude.m4 aclocal.m4 configure configure.in
include/sane/config.h.in: Fixed u_int* bug for Tru64 by
including sys/bitypes.h.
* PROJECTS: Added hpoj project.
@@ -441,7 +441,7 @@
2001-05-25 Karl Heinz Kremer <khk@khk.net>
* backend/epson.c: Allow more than 8 bit color depth even for
* backend/epson.c: Allow more than 8 bit color depth even for
preview mode since Xsane can handle this. Some code cleanup.
Removed ancient code that was used to determine the resolution
back when the backend still had a slider for the resolution
@@ -467,7 +467,7 @@
o Added support for Agfa StudioStar (weird pixel packing)
o A couple of small fixes (missing 'static' declarations)
o Upped version to 0.12.3
2001-05-23 Matto Marjanovic <maddog@yoo-hoo.ai.mit.edu>
* backend/microtek.c backend/microtek.h: Small fixes:
@@ -526,7 +526,7 @@
and libraries that are not available on every system and inclusion
of backends into CVS. Some minor fixes and clarifications.
* NEWS: Updated concerning sane man page and new backends.
2001-05-17 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
* updated umax backend to version 1.0 build 26
@@ -539,7 +539,7 @@
2001-05-16 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/.cvsignore: Added sane-sm3600.5.
* PROJECTS: Removed sm3600.
* TODO: Updates concerning memory leaks and access violations.
@@ -547,10 +547,10 @@
* AUTHORS doc/Makefile.in: doc/sane-sm3600.man doc/sane.man: Updated
documentation concerning sm3600 backend and added man page (from
from Marian Eichholz <eichholz@computer.org>).
* configure configure.in include/sane/config.h.in: Detect presence
of libusb and enable sm3600 backend.
* backend/Makefile.in backend/dll.c backend/sm3600-color.c
backend/sm3600-homerun.c backend/sm3600-scantool.h
backend/sm3600-scanutil.c backend/sm3600.desc
@@ -636,7 +636,7 @@
* TODO: Removed pie from lists of bugs. Removed sane manual page.
Added some context to the Tru64 problems.
2001-05-09 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/.cvsignore: Added sane.7.
@@ -645,7 +645,7 @@
* doc/Makefile.in doc/sane.man: Added SANE manual page.
* doc/sane.tex: Clarified the paragraph concerning sane_read. If
*len != 0 the status must be SANE_STATUS_GOOD.
2001-05-08 Simon Munton <simon@munton.demon.co.uk>
* backend/pie.c: Free devlist in sane_exit. Removed redundant check for
trailing newline in config file.
@@ -679,7 +679,7 @@
illegal memory access
2001-05-04 Henning Meier-Geinitz <henning@meier-geinitz.de>
* NEWS: Updated.
* PROJECTS: Removed umax_pp. Added Canon FB620S and FS2710 backend.
* TODO: Removed entry about umax_pp and comment about testing
@@ -692,21 +692,21 @@
2001-05-03 Henning Meier-Geinitz <henning@meier-geinitz.de>
* AUTHORS README: Updated concerning umax_pp.
* doc/Makefile.in doc/sane-umax_pp.man .cvsignore: Added manpage for
umax_pp (patch from Stéphane Voltz <svoltz@wanadoo.fr>).
* tools/README tools/Makefile.in tools/umax_pp.c tools/.cvsignore:
Added umax_pp test program (patch from Stéphane Voltz
Added umax_pp test program (patch from Stéphane Voltz
<svoltz@wanadoo.fr>).
* configure configure.in include/sane/config.h.in: Test for
linux/ppdev.h (for umax_pp backend).
* backend/umax_pp.c backend/umax_pp.h backend/umax_pp_low.c
backend/umax_pp_low.h backend/umax_pp_mid.c backend/umax_pp_mid.h
backend/umax_pp.conf backend/umax_pp.desc backend/Makefile.in
dll.conf: Added umax_pp backend (patch from Stéphane Voltz
backend/umax_pp.conf backend/umax_pp.desc backend/Makefile.in
dll.conf: Added umax_pp backend (patch from Stéphane Voltz
<svoltz@wanadoo.fr>).
2001-05-02 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -716,8 +716,8 @@
* doc/Makefile.in tools/sane-desc.el doc/.cvsignore: Install
sane.ps and sane.dvi if latex/makeindex/dvips is available.
Generate sane-backends.html in doc/. New target:
install-mostang. Installs the sane standard
Generate sane-backends.html in doc/. New target:
install-mostang. Installs the sane standard
(.ps, .ps.gz and html), the html manpages, and sane-backends.html
on www.mostang.com.
@@ -762,7 +762,7 @@
2001-04-29 Henning Meier-Geinitz <henning@meier-geinitz.de>
* sanei/sanei_wire.c: Don't free memory that's not alocced.
* sanei/sanei_config.c: Avoid reading uninitialized memory when
* sanei/sanei_config.c: Avoid reading uninitialized memory when
checking SANE_CONFIG_DIR.
* backend/mustek.c: Fixed several memory leaks.
* frontend/scanimage.c: Fixed memory leak.
@@ -817,7 +817,7 @@
* backend/net.desc: Added Jochen Eisinger's email address as contact
for the net backend.
* doc/sane-pnm.man: Point to pnm/saned security risks.
2001-04-21 Karl Heinz Kremer <khk@khk.net>
* backend/epson.conf: Commented out the usb config entry, this can
@@ -833,14 +833,14 @@
comment about me working on a sane man page. Removed entry about OS/2
problems in sanei_scsi.c.
* configure configure.in: Removed a newline in --help message.
* backend/pnm.c: Added several options: gamma tables
* backend/pnm.c: Added several options: gamma tables
(-> arrays), resolution option (word list), read only test option
(SANE_CAP_SOFT_DETECT), several options for returning status codes
in sane_read (all of this is from Michael Herder <crapsite@gmx.net>).
Added build version info, print version information in sane_init.
Use ../include/sane/ for includes. Version is 1.0.1.
* backend/pnm.desc: Updated contact info and version.
2001-04-19 Gerhard Jaeger <g.jaeger@earthling.net>
* backend/plustek.c: removed again that old fgets() call - sorry
@@ -859,7 +859,7 @@
Update contact information for backends. dc240 status is :NEW.
* TODO: added entries about as6e status shouldn't be :new, and
installing all documentation files.
2001-04-16 Petter Reinholdtsen <pere@td.org.uit.no>
* Makefile.in: New target 'sort-cvsignore' to keep all .cvsignore
@@ -873,7 +873,7 @@
2001-04-16 Henning Meier-Geinitz <hmg@gmx.de>
* README: Updated xsane link.
* configure configure.in backend/dll.c backend/dll.desc
* configure configure.in backend/dll.c backend/dll.desc
backend/net.c backend/net.desc include/sane/config.h.in
Yet another change in the version system for dll and net.
For sane_init return the version of the package but use
@@ -884,7 +884,7 @@
* doc/realeases.txt -> doc/releases.txt. Fixed spelling error.
Added entries about sane-backends.html, sane.ps, man pages,
platforms page.
2001-04-14 Gerhard Jaeger <g.jaeger@earthling.net>
* backend/plustek.c backend/plustek.desc backend/plustek.h
backend/plustek-share.h
@@ -917,7 +917,7 @@
* doc/scanimage.man: Add some more information about the -V option.
* frontend/scanimage.c: The option -V now also prints the version of
the backend (ususally dll).
2001-04-11 Abel Deuring <a.deuring@satzbau-gmbh.de>
* sanei/sanei_scsi.c: fixed a bug in error handling for the
Linux SG driver verison 3.x
@@ -926,11 +926,11 @@
* README.linux: Added a note, how to enable direct IO
2001-04-08 Henning Meier-Geinitz <hmg@gmx.de>
* backend/mustek.c backend/mustek.desc backend/mustek.CHANGES
Added detection of the TA for the Paragon 1200 SP Pro. Added
warning about not supported Trust scanners. Changed description
of contrast and brightness settings. Backend status is "stable"
of contrast and brightness settings. Backend status is "stable"
now. New version: 1.0-106.
* acinclude.m4 aclocal.m4: Fixed comment concerning dc240.
* configure configure.in include/sane/config.h.in: Added test for
@@ -938,7 +938,7 @@
Irix.
* doc/sane-avision.man doc/sane-ricoh.man doc/sane-s9036.man
doc/sane-tamarack.man: find-scanner is now called
sane-find-scanner and installed on the system so it's not
sane-find-scanner and installed on the system so it's not
necessary to point to the tools directory.
* frontend/scanimage.c: Fixed too long line in output.
* sane-config.in: Name is sane-config again (was sane-backends-config
@@ -946,7 +946,7 @@
* TODO: Removed entry about net.c not compiling on Irix and
references to find-scanner in the man pages. Updated numbers of
the compilation warnings. Still too many, however.
2001-04-07 Henning Meier-Geinitz <hmg@gmx.de>
* backend/sc240.c backend/dc240.h backend/dc240.conf
@@ -968,7 +968,7 @@
2001-03-31 Karl Heinz Kremer <khk@khk.net>
* backend/epson.*: Next attempt to get the reported number of
* backend/epson.*: Next attempt to get the reported number of
lines correct for the "color shuffling" part.
Added more comments.
@@ -986,7 +986,7 @@
Added entry about Kodak DC-240.
* TODO: Added Umax 1200P/2000P & HP 320C + Kodak DC-240 as backends
to be included. Added net.c compilation problem.
2001-03-10 Jochen Eisinger <jochen.eisinger@gmx.net>
* frontend/saned.c: fixed bug that allowed access to a scanner
@@ -998,8 +998,8 @@
2001-02-26 Abel Deuring <a.deuring@satzbau-gmbh.de>
* sanei/sanei_scsi.c: removed a possible null pointer
dereference in the Solaris/Schilling driver part. (Bug was
* sanei/sanei_scsi.c: removed a possible null pointer
dereference in the Solaris/Schilling driver part. (Bug was
found and fixed by William L. Sebok)
* backend/tamarack.c: inconsistent call to sanei_scsi_cmd fixed
@@ -1048,8 +1048,8 @@
* sanei/linux_sg3_err.h: New version provided by Douglas Gilbert.
Does not longer #include <linux/../scsi/scsi.h> and
#include <linux/../scsi/sg.h>
* sanei/sanei_scsi.c (Linux part): fixed some format errors in
debug output; added debug: system("cat /proc/scsi/sg/debug 1>&2"),
* sanei/sanei_scsi.c (Linux part): fixed some format errors in
debug output; added debug: system("cat /proc/scsi/sg/debug 1>&2"),
if debug level >= 255. (Suggestion by Douglas Gilbert)
2001-01-23 Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
@@ -1094,7 +1094,7 @@
modes, used options instead. Code cleanup. Updated manpage
concerning sane-find-scanner. New version: 1.0-104.
* configure: regenerated from configure.in.
2001-01-14 Petter Reinholdtsen <pere@td.org.uit.no>
* sanei/sanei_scsi.c: Make sure to initialize uninitialized
@@ -1110,7 +1110,7 @@
* sanei/sanei_scsi-c: (Linux part) timeout for SCSI commands
sent with the SG driver version increased; debug output of
device status, host status, driver status and sense buffer
device status, host status, driver status and sense buffer
added.
2001-01-09 Henning Meier-Geinitz <hmg@gmx.de>
@@ -1149,20 +1149,20 @@
2000-12-31 Henning Meier-Geinitz <hmg@gmx.de>
* backend/mustek.CHANGES backend/mustek.c backend/mustek.desc
* backend/mustek.CHANGES backend/mustek.c backend/mustek.desc
backend/mustek.h doc/sane-mustek.man: Added calibration for Pro
scanners and the SE 12000 SP Plus. Added option to use the full
legal size of the Paragon 1200 LS scanner. Added fast preview for
Pro scanners. Bug fixes. New version: 1.0-103.
2000-12-25 Karl Heinz Kremer <khk@khk.net
* backend/epson.*: Version 0.2.01
Added bit-depth selection again.
Added bit-depth selection again.
Fixed problem with bilevel scanning with Perfection610: The
line count has to be an even number with this scanner.
Several initialization fixes regarding bit depth selection.
This version goes back into the CVS repository, the 1.0.4
This version goes back into the CVS repository, the 1.0.4
release is out and therefore the code freeze is over.
Some general cleanup, added more comments.
@@ -1180,8 +1180,8 @@
* TODO: Removed entries about PATH_MAX, sanei_scsi_find_devices, and
shm.h. Added entry about the necessity to check HAVE_SYS_SHM_H.
* configure configure.in include/sane/config.h.in: Default to
--enable-warnings again. Don't set "-ansi" for OS/2. Test for
sys/shm.h.
--enable-warnings again. Don't set "-ansi" for OS/2. Test for
sys/shm.h.
* backend/GUIDE: Moved to doc/backend-writing.txt.
* doc/backend-writing.txt: New file (moved from backend/GUIDE).
Added comments about sanei-backend.h and PATH_MAX.
ChangeLogs/ChangeLog-1.0.6
+25 -25
View File
@@ -3,10 +3,10 @@
2001-11-04 Henning Meier-Geinitz <henning@meier-geinitz.de>
* sane-backends.lsm: Added keyword gphoto.
2001-10-31 Peter Fales <peter@fales.com>
* acinclude.m4, aclocal.m4, configure - Fix build failure due to
* acinclude.m4, aclocal.m4, configure - Fix build failure due to
renaming of gphoto2 header files
2001-10-30 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -40,7 +40,7 @@
2001-10-28 Peter Fales <peter@fales.com>
* backend/gphoto2.c, backend/gphoto2.conf: the ghoto2 people
made some pretty radical changes to the API and broke
made some pretty radical changes to the API and broke
the gphoto2 backend. Made the changes to allow the
gphoto2 backend to work with the latest changes from the
gphoto2 library CVS.
@@ -72,7 +72,7 @@
umax.c umax-scanner.c umax-scsidef.h
directory doc:
sane-umax.man /umax/sane-umax-advanced-options-doc.html
umax/sane-umax-standard-options-doc.html umax/umax.CHANGES
umax/sane-umax-standard-options-doc.html umax/umax.CHANGES
2001-10-27 Oliver Schwartz <Oliver.Schwartz@gmx.de>
@@ -357,9 +357,9 @@
* PROJECTS: Updated Winsane address.
* TODO: Added net/saned and .desc file entries. Removed scanimage/adf
extention entry.
* backend/pnm.c backend/pnm.desc: Make sure that *length=0 in
* backend/pnm.c backend/pnm.desc: Make sure that *length=0 in
sane_read(). Added more debug output.
2001-09-18 Stéphane Voltz <svoltz@wanadoo.fr>
* backend/umax_pp_low.c backend/umax_pp.desc:
@@ -379,7 +379,7 @@
2001-09-17 Simon Munton <simon@munton.demon.co.uk>
* backend/pie.c backend/pie.conf: Changed ADLIB to AdLib as this is
what the scanner returns and the comparison is case sensitive
* doc/sane-pie.man: Update the status of the AdLib JetScan 630
2001-09-17 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -388,12 +388,12 @@
are included in the distribution now. Updated bearpaw and OS/2
entries.
* NEWS: Created preliminary entry for 1.0.6.
2001-09-16 Peter Fales <peter@fales.com>
* backend/dc240.desc: Change status from new to alpha
acinclude.m4, aclocal.m4, configure: Cosmetic changes to
acinclude.m4, aclocal.m4, configure: Cosmetic changes to
help text and change function used in gphoto2 lib check due
to API change
@@ -401,7 +401,7 @@
* backend/umax_pp_low.c backend/umax_pp_mid.c
tools/umax_pp.c:
change ppdev support to compile and run on linux kernel
change ppdev support to compile and run on linux kernel
prior to 2.4.5
2001-09-13 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -413,7 +413,7 @@
doc/mustek_usb/mustek_usb.TODO: Update to mustek_usb backend
1.0-6. Increased resolution to the maximum hardware supports.
No fixed resolution any more. Gamma table support. Bugfixes.
2001-09-12 Peter Fales <peter@fales.com>
* acinclude.m4 aclocal.m4 configure configure.in: Changes to
@@ -444,7 +444,7 @@
* backend/mustek.c backend/mustek.desc doc/mustek/mustek.CHANGES:
Fixed problem with gamma correction. New version: 1.0-113.
* backend/mustek_usb.c backend/mustek_usb.desc
* backend/mustek_usb.c backend/mustek_usb.desc
backend/mustek_usb_high.c backend/mustek_usb_low.c
backend/mustek_usb_low.h backend/mustek_usb_mid.c
backend/mustek_usb_mid.h doc/mustek_usb/mustek_usb.CHANGES:
@@ -458,7 +458,7 @@
backend/mustek_usb_high.c backend/mustek_usb_high.h
backend/mustek_usb_low.c backend/mustek_usb_low.h
backend/mustek_usb_mid.c backend/mustek_usb_mid.h:
Added backend mustek_usb for Mustek USB scanners. Currently the
Added backend mustek_usb for Mustek USB scanners. Currently the
600 CU, 1200 CU, 1200 CU Plus and 1200 UB are supported.
* backend/Makefile.in dll.conf: Added entries for mustek_usb.
* doc/Makefile.in doc/mustek_usb/mustek_usb.CHANGES
@@ -486,9 +486,9 @@
2001-09-06 Stéphane Voltz <svoltz@wanadoo.fr>
* backend/umax_pp_low.c: made CmdSetDataBuffer static
* backend/Makefile.in: removed sanei_config2 from
* backend/Makefile.in: removed sanei_config2 from
umax_pp depencies
2001-09-05 Jochen Eisinger <jochen.eisinger@gmx.de>
* backend/net.c: ignoring size of parameter value for
@@ -512,7 +512,7 @@
2001-09-04 Jochen Eisinger <jochen.eisinger@gmx.de>
* backend/net.desc doc/saned.man doc/sane-net.man: added
pointer to new saned homepage
pointer to new saned homepage
(http://home.nexgo.de/jochen.eisinger/saned/)
2001-09-04 Peter Kirchgessner <peter@kirchgessner.net>
@@ -550,7 +550,7 @@
* backend/mustek.c backend/mustek.desc doc/sane-mustek.man
doc/mustek/mustek.CHANGES: Update to backend version 1.0-112.
Some minor fixes for returning the scan slider and OS/2.
2001-08-26 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
* backend/umax.c backend/umax.desc doc/umax/umax.CHANGES:
@@ -560,7 +560,7 @@
* backend/umax_pp_low.c tools/umax_pp.c:
Finished probe code cleaning, increased version number
2001-08-16 Henning Meier-Geinitz <henning@meier-geinitz.de>
* configure configure.in: Fixed bug concerning libusb that
@@ -577,22 +577,22 @@
doc/Makefile.in doc/sane-usb.man: Added sane USB interface.
* include/sane/sanei_config.h sanei/sanei_config2.c: Added support
for searching USB devices ("usb vendor product").
* doc/sane-find-scanner.man tools/Makefile.in
* doc/sane-find-scanner.man tools/Makefile.in
tools/sane-find-scanner.c: Added USB support.
* doc/sane.man: Added information for USB scanners.
* TODO: Removed USB entries. Removed entry about checking for
/etc/ld.so.conf, this shouldn't be necessary any longer. Removed
entry about saned freezing, no bug reports about this for a long
time. Removed entry about moving .desc files, this doesn't seem to
be necessary. Added proposal to include libieeee1284.
be necessary. Added proposal to include libieeee1284.
* doc/.cvsignore: Updated concerning sane-usb.5.
2001-08-05 Peter Fales <peter@fales.com>
* backend/dc240.c - Previously, the backend always assumed that
the images were stored in the 100DC240 directory in the
camera. It now determines the directory automatically. If
multiple directories are present, it will eventually let you
multiple directories are present, it will eventually let you
pick the directory, but that feature hasn't been completed
yet.
@@ -639,10 +639,10 @@
2001-07-11 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/mustek.c backend/mustek.desc backend/mustek.h
doc/mustek/mustek.CHANGES: Fixed bug in fix_line_distance_block
doc/mustek/mustek.CHANGES: Fixed bug in fix_line_distance_block
that resulted in too much data transfered to the frontend.
New version: 1.0-110.
2001-07-09 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/mustek.c backend/mustek.conf backend/mustek.desc
@@ -650,7 +650,7 @@
Fixed problem with SCSI command queuing. Fixed problem that
resulted in black images on some Paragon 6000SP scanners. Added
option to disable backtracking. New version: 1.0-109.
2001-07-07 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/Makefile.in: Use 6 lines as top/bottom margin for man2html
ChangeLogs/ChangeLog-1.0.7
+49 -49
View File
@@ -8,7 +8,7 @@
* TODO: Added entries about config.h, sane-backends.html, device file
types, the HPUX -ansi problem, and make distclean.
* backend/Makefile.in backend/coolscan2.desc: Added description file
for coolscan2 backend (from Major Andras
for coolscan2 backend (from Major Andras
<andras@users.sourceforge.net>).
* backend/gphoto2.desc: gphoto2 is no longer "NEW".
@@ -16,14 +16,14 @@
* PROJECTS: Added info about Canon N670U project. Added info about
Sceptre S1200 project.
* backend/sceptre.desc backend/Makefile.in: New file (from Frank Zago
* backend/sceptre.desc backend/Makefile.in: New file (from Frank Zago
<fzago@greshamstorage.com>).
* backend/microtek2.desc doc/sane-microtek2.man: Updated microtek2
documentation (from karsten.festag@t-online.de (Karsten Festag)).
* Makefile.in README.netbsd: New file. Information about problems
with shared libs.
* configure configure.in: Include <sys/types.h> and <sys/ipc.h> also
when checking for struct semun in <sys/sem.h>. This fixes a
when checking for struct semun in <sys/sem.h>. This fixes a
compilation problem on FreeBSD.
2002-01-31 Peter Fales <peter@fales.com>
@@ -31,7 +31,7 @@
* configure, acinclude.m4, aclocal.m4 - Latest gphoto2 updates
changed the version number, breaking the gphoto2 backend. This
is a one line change to correct that.
2002-01-31 Henning Meier-Geinitz <henning@meier-geinitz.de>
* PROJECTS: Added info about GT-68xx backend.
@@ -49,7 +49,7 @@
2002-01-27 Gerhard Jaeger <g.jaeger@earthling.net>
* backend/plustek-usbhw.c: Fixed LM9831 problem...
2002-01-27 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/microtek.c backend/microtek2.h: Fixed undefined behaviour
@@ -98,7 +98,7 @@
* backend/snapscan.c backend/snapscan-scsi.c backend/snapscan.h
Fix recognition of Acer 320U, Fix for spaces in model ID strings,
Change snapscan version to 1.4.7
2002-01-23 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/mustek.c backend/mustek_usb.c doc/mustek/mustek.CHANGES
@@ -114,7 +114,7 @@
Change snapscan version to 1.4.6
* backend/snapscan.conf
Use /dev/sg0 as default instead of the more uncommon /dev/sga
---- sane-backends-1.0.7-beta1 ----
2002-01-21 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -172,7 +172,7 @@
po/umax.de.po: Moved the options contained in saneopts.h into a
seperate file. So the backend po files are much smaller and easier to
read and the saneopts translations are consistent through backends.
* backend/microtek2.c backend/microtek2.h: Update to backend
* backend/microtek2.c backend/microtek2.h: Update to backend
0.95-20020112 (from karsten.festag@t-online.de (Karsten Festag)).
* include/sane/sanei.h include/sane/sanei_config.h
include/sane/sanei_thread.h sanei/sanei_config.c: Made documentation
@@ -189,7 +189,7 @@
* configure, acinclude.m4, aclocal.m4 - Update gphoto2 version check
* backend/gphoto2.c - Improved support for options not
supported by camera. Cosmetic cleanup.
2002-01-18 Rene Rebe <rene.rebe@gmx.net>
* docs/sane-avision.man: added the new disable-gamma-table option
@@ -267,8 +267,8 @@
converted gp_debug_printf to gp_log
configure.in, configure, acinclude.m4, aclocal.m4 - Improvements
to the way gphoto2 is detected and used based on using
gphoto2-config.
to the way gphoto2 is detected and used based on using
gphoto2-config.
2002-01-15 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -280,18 +280,18 @@
translatable text in backend sources.
2002-01-14 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c backend/snapscan-usb.c:
Added workaround for bug in semctl() on PPC;
backend version 1.4.5
2002-01-14 Peter Fales <peter@fales.com>
* backend/gphoto2.c: Was requiring the device to have the
IMAGE_CAPTURE capability - changed this to a warning instead
of an error so the "Directory Browse" camera can be used.
Don't require a port to be specified for the "Directory
Browse" camera. Fixed a bug that can result in extra data
at the end of the iamge. Allow the returned image image to be
Browse" camera. Fixed a bug that can result in extra data
at the end of the iamge. Allow the returned image image to be
larger than the "estimate" specified in the configuration file.
2002-01-14 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -351,9 +351,9 @@
* frontend/saned.c: Check that the IP addresses of the peer are the
same for control and data connections. Exit, if this is not the
case. Changed some debug levels.
* PROJECTS: Updated some URLs. Removed m3096g and Mustek BearPaw
* PROJECTS: Updated some URLs. Removed m3096g and Mustek BearPaw
(both are included now in SANE). Added test backend and SaneTwain.
* TODO: Removed primax (not a backend), fixed viceo URL, updated
* TODO: Removed primax (not a backend), fixed viceo URL, updated
qcam entries, added entries about ipv6 support, removed saned
address validation entry. Added entry about scanimage + NLS.
* backend/mustek_usb.c backend/mustek_usb.desc
@@ -368,10 +368,10 @@
addressed security issue with tempfile
2002-01-10 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c backend/snapscan.h backend/snapscan.desc:
Update to snapscan-20020110 (Version 1.4.4)
- add support for SnapScan e42
Update to snapscan-20020110 (Version 1.4.4)
- add support for SnapScan e42
2002-01-10 Gerhard Jaeger <g.jaeger@earthling.net>
@@ -390,7 +390,7 @@
* backend/Makefile.in: Changed to compile the Plustek backend
2002-01-10 Henning Meier-Geinitz <henning@meier-geinitz.de>
* po/pnm.de.po: Added German translation for pnm backend.
* po/mustek.de.po po/mustek_usb.de.po: Updated German translations.
They should be complete now.
@@ -401,9 +401,9 @@
* README: Added description of --enable-translations.
* doc/sane.man: Added comment about translations.
* Makefile.in: Added Changelogs to DISTFILES. test/Makefile is
removed in make distclean now.
removed in make distclean now.
* doc/backend-writing.txt: Added paragraph about getting started.
Added comments about ANSI C, compilation warnings, testing and
Added comments about ANSI C, compilation warnings, testing and
keeping manpages up-to-date.
* backend/pnm.c: Added SANE_I18N() marks.
* TODO: Cleanup. Moved several entries to doc/backend-writing.txt.
@@ -443,7 +443,7 @@
root dir to this file. Added standard variables and .PHONY.
* backend/Makefile.in doc/Makefile.in frontend/Makefile.in
japi/Makefile.in lib/Makefile.in po/Makefile.in sanei/Makefile.in
testsuite/Makefile.in tools/Makefile.in: Added target "dist".
testsuite/Makefile.in tools/Makefile.in: Added target "dist".
Fixed .PHONY.
* Makefile.in: Added targets "dist" and "sane-backends". make dist
creates sane-backends-x.y.z.tar.gz and make sane-backends also
@@ -476,8 +476,8 @@
* po/mustek.de.po mustek_usb.de.po: Added German translations
for Mustek SCSI and USB backends. Translations for well-known
options are missing.
* Makefile.in configure configure.in: Added option
--enable-translations to configure. I18N support is disabled by
* Makefile.in configure configure.in: Added option
--enable-translations to configure. I18N support is disabled by
default.
* po/.cvsignore: New file.
* doc/sane-mustek_usb.man doc/mustek_usb/mustek_usb.CHANGES:
@@ -490,7 +490,7 @@
* backend/Makefile.in backend/dll.conf backend/umax1220u-common.c
backend/umax1220u.c backend/umax1220u.conf backend/umax1220u.desc:
Added new backend umax1220u for UMAX Astra 1220U and 2000U
scanners (patch from Marcio Luis Teixeira
scanners (patch from Marcio Luis Teixeira
<marciot@holly.colostate.edu>).
* doc/Makefile.in doc/sane.man doc/sane-umax1220u.man: Added
documentation fo umax1220u backend (patch from from Marcio Luis
@@ -513,7 +513,7 @@
comparison, not host names as before. It's possible to put
hostnames, FQDNs and IP addresses into saned.conf. Limitations:
Only the first IP address in struct hostent is checked. IPv6 is
untested. The change is based on a patch by Petter Reinholdtsen
untested. The change is based on a patch by Petter Reinholdtsen
<pere@hungry.com>.
Return SANE_STATUS_ACCESS_DENIED if access was not granted instead
of SANE_STATUS_IO_ERROR.
@@ -526,7 +526,7 @@
2001-01-06 Karl Heinz Kremer <khk@khk.net>
* backend/epson.c: Undefine TEST_IOCTL again, which was enabled
by accident.
by accident.
2002-01-06 Stéphane Voltz <svoltz@wanadoo.fr>
@@ -535,7 +535,7 @@
Corrected parport mode being set before being claimed.
* backend/umax_pp.c: changed build number.
* tools/umax_pp.c: changed version.
2002-01-05 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
* backend/umax-scanner.c, umax.c, umax.conf, umax.desc, umax.h:
@@ -543,7 +543,7 @@
2002-01-05 Karl Heinz Kremer <khk@khk.net>
* backend/epson.[ch]: Check for (and set) s->fd to -1 when
* backend/epson.[ch]: Check for (and set) s->fd to -1 when
scanner is closed. Removed black gamma table - only RGB
is used, even for grayscale scans. Do not call access()
when running on OS/2 or when using a parallel port scanner.
@@ -626,22 +626,22 @@
2001-12-25 Henning Meier-Geinitz <henning@meier-geinitz.de>
* README.linux: Used "sane-find-scanner". Some minor changes.
* config.guess config.sub: Updated from
* config.guess config.sub: Updated from
http://savannah.gnu.org/projects/config.
* TODO: New section: "platform-specific". Added some problems with
*BSD. Some minor fixes and additions.
* tools/sane-find-scanner.c: Added OpenBSD device files.
* README.openbsd: New file. Some information on how to get SANE
* README.openbsd: New file. Some information on how to get SANE
running on top of OpenBSD.
2001-12-22 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/mustek_usb.c backend/mustek_usb.conf backend/mustek_usb.desc
backend/mustek_usb_low.c backend/mustek_usb_low.h
backend/mustek_usb_low.c backend/mustek_usb_low.h
doc/sane-mustek_usb.man doc/mustek_usb/mustek_usb.CHANGES:
Made usb_low_read_rows more robust. Limited maximum block size and
added option for this. New version: 1.0-9.
2001-12-21 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c backend/snapscan.h
@@ -649,7 +649,7 @@
2001-12-20 Peter Fales <peter@fales.com>
* backend/dc25.c - Fixed a potential security problem due to a
* backend/dc25.c - Fixed a potential security problem due to a
race condition involving temporary file creation. Also did some
cosmetic cleanup and removed some un-needed code.
@@ -697,19 +697,19 @@
* sanei/sanei_ab306: Removed warning: `dev_io_fd' defined but not
used. Variable used only by FreeBSD. Added test for FreeBSD.
Patch from Stephen Torri <storri@ameritech.net>.
2001-11-30 Henning Meier-Geinitz <henning@meier-geinitz.de>
* testsuite/Makefile.in testsuite/README: Added comment about
the need to enable pnm. Made output easier to read.
2001-11-29 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/mustek.c backend/mustek.desc doc/mustek/mustek.CHANGES:
* backend/mustek.c backend/mustek.desc doc/mustek/mustek.CHANGES:
Added check for TL_X > BR_X or TL_Y > BR_Y. New version: 1.0-115.
* TODO: Added entry about TL_X < BR_X problems and semaphores for OS/2.
Removed entry about BearPaw scanners.
2001-11-26 Abel Deuring <a.deuring@satzbau-gmbh.de>
* backend/sharp.c: added an additional check to prevent OS/2 from
define "#define USE_FORK"
@@ -722,13 +722,13 @@
* backend/umax_pp_low.c: fixed color calibration bug. Scans are
of much better quality now. Manual settings now work correctly.
* tools/umax_pp.c: changed version.
2001-11-22 Henning Meier-Geinitz <henning@meier-geinitz.de>
* config.guess config.sub: Fetched new versions from
http://savannah.gnu.org/projects/config.
* mkinstalldirs: Updated for OS/2 (from "Franz Bakan"
* mkinstalldirs: Updated for OS/2 (from "Franz Bakan"
<fbakan@gmx.net>).
* backend/mustek.c backend/mustek.desc backend/mustek.h
doc/mustek/mustek.CHANGES: Added OS/2 compatibility fixes
@@ -774,7 +774,7 @@
2001-11-15 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/mustek_usb.c backend/mustek_usb.conf backend/mustek_usb.desc
backend/mustek_usb.h backend/mustek_usb_high.c
backend/mustek_usb.h backend/mustek_usb_high.c
backend/mustek_usb_high.h backend/mustek_usb_low.c
backend/mustek_usb_low.h backend/mustek_usb_mid.c
backend/mustek_usb_mid.h doc/sane-mustek_usb.man
@@ -810,12 +810,12 @@
debug levels. Removed some compilation warnings. New version: 1.0.5.
2001-11-11 Abel Deuring <a.deuring@satzbau-gmbh.de>
* sanei/sanei_scsi.c (Linux part):
- improved handling of status codes returned by the SG driver.
Device status INTERMEDIATE GOOD and CONDITION MET are now mapped
to SANE_STATUS_GOOD; device status BUSY and a few driver status
* sanei/sanei_scsi.c (Linux part):
- improved handling of status codes returned by the SG driver.
Device status INTERMEDIATE GOOD and CONDITION MET are now mapped
to SANE_STATUS_GOOD; device status BUSY and a few driver status
codes are mapped to SANE_STATUS_DEVICE_BUSY
- On SCSI command completion, the (sometimes bogus) residual count
- On SCSI command completion, the (sometimes bogus) residual count
is no longer subtracted from *req->dstlen
* backend/sharp.c: if a READ command fails with SANE_STATUS_DEVICE_BUSY,
retry a few times.
@@ -830,7 +830,7 @@
* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.c
backend/umax_pp_mid.h backend/umax_pp.c backend/umax_pp.h:
use ENABLE_DIRECTIO to compile in direct I/O. Corrected the long
use ENABLE_DIRECTIO to compile in direct I/O. Corrected the long
standing scan area origin detection bug. Improved parport mode
negociation.
ChangeLogs/ChangeLog-1.0.8
+87 -87
View File
@@ -3,7 +3,7 @@
2002-05-27 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/plustek-usbscan.c: Critical bugfix to avoid bumping the
scan slider at the end of the scan. Commited on behalf of
scan slider at the end of the scan. Commited on behalf of
g-jaeger@t-online.de (G. Jaeger).
2002-05-26 Karl Heinz Kremer <khk@khk.net>
@@ -31,7 +31,7 @@
status to ":new" for release.
* doc/descriptions/umax1220u.desc: Changed status from :new to :alpha
as the baceknd was already in SANE 1.0.7.
2002-05-25 Andras Major <andras@users.sourceforge.net>
* doc/descriptions/coolscan2.desc: changed status to :new.
@@ -60,7 +60,7 @@
2002-05-22 Henning Meier-Geinitz <henning@meier-geinitz.de>
* sanei/sanei_scsi.c: Fixed sanei_scsi_cmd2() for OPENSTEP (from
* sanei/sanei_scsi.c: Fixed sanei_scsi_cmd2() for OPENSTEP (from
Oliver Schirrmeister <oschirr@abm.de>).
2002-05-21 Petter Reinholdtsen <pere@td.org.uit.no>
@@ -70,7 +70,7 @@
2002-05-14 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.conf: Added additional USB IDs for Acer 320U and
* backend/snapscan.conf: Added additional USB IDs for Acer 320U and
Acer 620U
2002-05-09 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -124,11 +124,11 @@
2002-05-02 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c backend/snapscan-options.c
backend/snapscan-scsi.c backend/snapscan-usb.c po/snapscan.de.po:
backend/snapscan-scsi.c backend/snapscan-usb.c po/snapscan.de.po:
Snapscan backend version 1.4.13
- Support for ADF
- Fixed status handling after cancel
* doc/description/snapscan.desc:
* doc/description/snapscan.desc:
- Add Guillemot Scan@home 1248 USB
- Fix vendor URLs
@@ -149,7 +149,7 @@
* TODO:
Added entry to saned section:
- Add support for IP ranges in saned.conf (like 10.0.0.0/8)
2002-04-28 Frank Zago <fzago@greshamstorage.com>
* tools/Makefile.in tools/sane-find-scanner.c: bug fixes, better
@@ -157,20 +157,20 @@
2002-04-29 Kazuya Fukuda <kaafuu@mug.biglobe.ne.jp>
* backend/nec.c: fixed a compile problem for Dec Unix v4
and probably other 64 bit platform.
and probably other 64 bit platform.
* AUTHORS: Update email address for Kazuya Fukuda
2002-04-27 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c backend/snapscan.h backend/snapscan-options.c
backend/snapscan-scsi.c backend/snapscan-usb.c po/snapscan.de.po:
backend/snapscan-scsi.c backend/snapscan-usb.c po/snapscan.de.po:
Snapscan backend version 1.4.12
- Removed SCSI debug options
- Fixed option handling (errors found by tstbackend)
2002-04-27 Henning Meier-Geinitz <henning@meier-geinitz.de>
* frontend/scanimage.c: Fixed scanimage SANE_CAP_AUTOMATIC bug
* frontend/scanimage.c: Fixed scanimage SANE_CAP_AUTOMATIC bug
(from David Paschal <paschal@rcsis.com>).
2002-04-26 Peter Fales <peter@fales-lorenz.net>
@@ -224,7 +224,7 @@
* backend/dc240.c backend/gphoto2.c: Various minor bug fixes for
problems found by tstbackend
* AUTHORS: Upate email address for Peter Fales
* AUTHORS: Upate email address for Peter Fales
2002-04-22 Frank Zago <fzago@greshamstorage.com>
@@ -299,7 +299,7 @@
and FS2700, by Mitsuru Okaniwa <m-okaniwa@bea.hi-ho.ne.jp>
and Ulrich Deiters <ukd@xenon.pc.Uni-Koeln.DE>
2002-04-19 Frank Zago <fzago@greshamstorage.com>
2002-04-19 Frank Zago <fzago@greshamstorage.com>
* AUTHORS: fixed typos, formatting and added the tstbackend frontend.
* frontend/Makefile.in frontend/tstbackend.c: a frontend to test
@@ -332,7 +332,7 @@
2002-04-17 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/fujitsu-scsi.h backend/fujitsu.c backend/fujitsu.conf
backend/fujitsu.h doc/sane-fujitsu.man
backend/fujitsu.h doc/sane-fujitsu.man
doc/descriptions/fujitsu.desc: Added new fujitsu backend (from
Oliver Schirrmeister <oschirr@abm.de>). This backend supersedes the
m3096g backend and also includes the m3091 backend.
@@ -374,7 +374,7 @@
2002-04-14 Gerhard Jaeger <gerhard@gjaeger.de>
* backend/plustek.[ch], backend/plustek-usbhw.c, backend/plustek-usbio.c,
backend/plustek-usbscan.c, backend/plustek-usbshading.c
backend/plustek-usbscan.c, backend/plustek-usbshading.c
backend/plustek-usb.c, backend/plustek-devs.c backend/plustek-usb.h
backend/plustek-share.h: Code cleanup, fixed OS/2 compilation breakage
fixed problem that causes non LM983x based devices to crash, minor fixes
@@ -407,7 +407,7 @@
for sorted sane-backends.html, and saneopts.??.po problem.
Removed backends from list of inclusion beacuse of lack of response:
v4l2, lhii, viceo (they stay in PROJECTS). Removed snapscan from
exported symbols bug list. Updated doxygen list.
exported symbols bug list. Updated doxygen list.
2002-04-12 Frank Zago <fzago@greshamstorage.com>
@@ -415,10 +415,10 @@
info.
2002-04-12 Matthew Duggan <stauff1@users.sourceforge.net>
* backend/canon_pp-io.c: Updated for new libieee1284 interface
* backend/canon_pp-io.c: Updated for new libieee1284 interface
(version 0.1.5)
* acinclude.m4 aclocal.m4 configure configure.in:
* acinclude.m4 aclocal.m4 configure configure.in:
Added check for libieee1284 > 0.1.5
2002-04-08 Rene Rebe <rene.rebe@gmx.net>
@@ -436,14 +436,14 @@
* backend/umax_pp_low.c: fixed 8 bits I/O support
2002-04-10 Oliver Schwartz <oliver.schwartz@gmx.de>
* backend/snapscan-scsi.c
Removed illegal character
* backend/snapscan-usb.h
Removed declaration of bqelements
2002-04-10 Oliver Schwartz <oliver.schwartz@gmx.de>
* backend/snapscan-usb.c
make bqelements static
* backend/snapscan-scsi.c
@@ -489,7 +489,7 @@ i
* doc/descriptions/avision.desc: fixed syntax
2002-04-08 Henning Meier-Geinitz <henning@meier-geinitz.de>
* Makefile.in: make libcheck now also checks for non-static variables.
* v4l.c: Some variables haven't been static. sane_set_io_mode must
return SANE_STATUS_GOOD if non_blocking == SANE_FALSE.
@@ -503,10 +503,10 @@ i
2002-04-07 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/canon_pp.c backend/canon_pp-dev.c backend/canon_pp-io.c
backend/canon_pp-dev.h: Changed timeouts and added scanner sleeps
to improve reliability of 6x0P models. Also corrected typo which
caused full bed scans to fail. Disabled problematic detect for now,
will make detection slightly slower. Patch from Matthew Duggan
backend/canon_pp-dev.h: Changed timeouts and added scanner sleeps
to improve reliability of 6x0P models. Also corrected typo which
caused full bed scans to fail. Disabled problematic detect for now,
will make detection slightly slower. Patch from Matthew Duggan
<stauff1@users.sourceforge.net>.
* doc/descriptions/canon_pp.desc: Added man page, incremented version.
Patch from Matthew Duggan <stauff1@users.sourceforge.net>.
@@ -515,12 +515,12 @@ i
* backend/Makefile.in backend/canon630u-common.c backend/canon630u.c
backend/canon630u.conf backend/dll.conf backend/lm9830.h: Added
canon630u backend. This backend supports the CanoScan 630u and
CanoScan 636u (hopefully). Patch from Nathan Rutman
CanoScan 636u (hopefully). Patch from Nathan Rutman
<nathan@gordian.com>.
* doc/.cvsignore doc/Makefile.in doc/sane-canon630u.man
doc/descriptions/canon630u.desc: Added documentation and description
of canon630u backend. Patch from Nathan Rutman
<nathan@gordian.com>.
of canon630u backend. Patch from Nathan Rutman
<nathan@gordian.com>.
* PROJECTS doc/sane.man: Updated for canon630u backend.
* AUTHORS: Updated for canon630u backend.
* doc/saned.man: The path in the xinetd example pinted to /usr/local
@@ -530,7 +530,7 @@ i
2002-04-06 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/mustek.c doc/descriptions/mustek.desc
* backend/mustek.c doc/descriptions/mustek.desc
doc/mustek/mustek.CHANGES: Fixed color three-pass scanning for some
scanners.
* PROJECTS: Added Hewlett-Packard ScanJet 2200c project.
@@ -541,11 +541,11 @@ i
* configure, acinclude.m4, aclocal.m4 - Another tweak to the
allowed gphoto2 version numbers
2002-04-02 Henning Meier-Geinitz <henning@meier-geinitz.de>
* acinclude.m4 aclocal.m4 configure configure.in: Added checks for
libieee1284. Enable canon_pp backend if found. Patch from
libieee1284. Enable canon_pp backend if found. Patch from
"Matthew Duggan" <stauff@guarana.org>.
* backend/Makefile.in backend/canon_pp-dev.c backend/canon_pp-dev.h
backend/canon_pp-io.c backend/canon_pp-io.h backend/canon_pp.c
@@ -558,10 +558,10 @@ i
* PROJECTS TODO: Removed canon_pp.
* doc/.cvsignore: Added sane-canon_pp.5.
* doc/descriptions-external/canon_pp.desc: Removed.
2002-03-30 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions-external/test.desc: Added description of the test
* doc/descriptions-external/test.desc: Added description of the test
backend.
* PROJECTS: Added homepage of the test backend.
@@ -569,7 +569,7 @@ i
* backend/pnm.c doc/descriptions/pnm.desc: Check if option is settable
when automatically setting it. New version: 1.0.7.
* backend/Makefile.in doc/Makefile.in frontend/Makefile.in
* backend/Makefile.in doc/Makefile.in frontend/Makefile.in
include/Makefile.in po/Makefile.in tools/Makefile.in:
Support for variable DESTDIR. If set, all files are installed to that
location. Also print the filename of the installed file, not only the
@@ -585,7 +585,7 @@ i
2002-03-27 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
* removed unused definitions in include/sane/saneopts.h:
SMEAR, TEN_BIT_MODE, TWELVE_BIT_MODE, RGB_PREVIEW_PATCH,
SMEAR, TEN_BIT_MODE, TWELVE_BIT_MODE, RGB_PREVIEW_PATCH,
START_SCAN_PATCH
2002-03-26 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -603,8 +603,8 @@ i
Updated to new mail-address and backend URL
2002-03-24 Oliver Schwartz <oliver.schwartz@gmx.de>
* backend/snapscan.c: Fix segfault in sane_exit if no devices were
* backend/snapscan.c: Fix segfault in sane_exit if no devices were
found.
2002-03-24 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -613,11 +613,11 @@ i
Update to libtool 1.4.2. Included local changes: use soname "libsane"
for all os but AIX. Use "normal" shared libs (.so) instead of archives
on AIX. Use 1 instead of 2 as major number with Irix.
* Makefile.in ltconfig: Removed ltconfig as it is no longer used by
* Makefile.in ltconfig: Removed ltconfig as it is no longer used by
libtool.
* TODO: More status indicators for backends to include. Removed
entry about the grand Fujitsu reunification. Updated entry about the
DBG warnings. Removed entry about splitted sane-backends.html.
entry about the grand Fujitsu reunification. Updated entry about the
DBG warnings. Removed entry about splitted sane-backends.html.
Removed entries about libtool problems. Added entry about plustek on
OS/2 problem.
* backend/pnm.c doc/descriptions/pnm.desc: If fread returns 0, check
@@ -629,17 +629,17 @@ i
2002-03-24 Oliver Schwartz <oliver.schwartz@gmx.de>
* backend/snapscan-options.c: New file (option functions moved from
* backend/snapscan-options.c: New file (option functions moved from
snapscan.c)
* backend/snapscan-utils.c: Removed file
* backend/Makefile.in: Added snapscan-options.c, removed snapscan-utils.c
* backend/snapscan.c backend/snapscan.h backend/snapscan-scsi.c
backend/snapscan-usb.c backend/snapscan.h backend/snapscan.conf:
backend/snapscan-usb.c backend/snapscan.h backend/snapscan.conf:
Snapcan-backend ver. 1.4.9
- Moved option functions to snapscan-options.c
- Autodetect USB scanners on Linux
- Better error reporting
2002-03-21 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/backend-writing.txt: Updated concerning splitted .desc
@@ -653,17 +653,17 @@ i
* backend/pnm.c doc/descriptions/pnm.desc: Don't allow to set options
that don't have SANE_CAP_SOFT_SELECT and don't allow read and write
for options that are inactive. New version: 1.0.5.
2002-03-20 Henning Meier-Geinitz <henning@meier-geinitz.de>
* sanei_wire.c: Set allocated memory to 0 to avoid delivering
garbage to the frontend.
* backend/mustek.c backend/mustek.desc backend/mustek.h
* backend/mustek.c backend/mustek.desc backend/mustek.h
doc/mustek/mustek.CHANGES: Fixed halftone pattern handling. The
buffer was way too small. Option 0 has an empty name. Better debug
output for dev_cmd. Set size for group options to 0. Set size of
halftone pattern to non 0.
* backend/mustek_usb.c backend/mustek_usb.desc
* backend/mustek_usb.c backend/mustek_usb.desc
doc/mustek_usb/mustek_usb.CHANGES: Option 0 has an empty name now.
Group options have size 0 now. Check also for SANE_ACTION_SET_AUTO.
Removed buggy output in sane_control_option. Added more debug output
@@ -691,11 +691,11 @@ i
doc/descriptions/sharp.desc doc/descriptions/sm3600.desc
doc/descriptions/snapscan.desc doc/descriptions/sp15c.desc
doc/descriptions/st400.desc doc/descriptions/tamarack.desc
doc/descriptions/template.desc. doc/descriptions/umax1220u.desc
doc/descriptions/template.desc. doc/descriptions/umax1220u.desc
doc/descriptions/umax.desc doc/descriptions/umax_pp.desc
doc/descriptions/v4l.desc:
Moved descriptions of included backends from backend/*.desc.
* doc/descriptions-external/canon_pp.desc
* doc/descriptions-external/canon_pp.desc
doc/descriptions-external/coolscan2.desc
doc/descriptions-external/hp4200.desc
doc/descriptions-external/hpoj.desc
@@ -716,7 +716,7 @@ i
* backend/Makefile.in: Updated DISTFILES.
* backend/*.desc backend/template.desc.: Removed (now in doc/).
* tools/.cvsignore: Added sane-desc.el.
2002-03-19 Frank Zago <fzago@greshamstorage.com>
* matsushita backend: updates and fixes.
@@ -739,7 +739,7 @@ i
segfault when name="". Type for option 0 must be set to
SANE_TYPE_INT explicitely. Updated GPL/SANE headers.
* TODO: Added entry about auto-loading SCSI drivers. Removed entry
about new SANE types. Moved entry about config.guess to
about new SANE types. Moved entry about config.guess to
doc/releases.txt. Added more info about libtool problems.
* doc/releases.txt: Added info about config.guess and config.sub.
* config.guess config.sub: Updated from upstream.
@@ -747,19 +747,19 @@ i
2002-03-17 Peter Fales <peter@fales.com>
* backend/gphoto2.c - Minor bug fixes for problems found by tstbackend
2002-03-16 Gerhard Jaeger <g.jaeger@earthling.net>
* backend/plustek.[ch]: fixed a bug, that causes segfaulting the backend
when using the USB autodetection stuff
when using the USB autodetection stuff
2002-03-15 Stéphane Voltz <svoltz@wanadoo.fr>
* backend/umax_pp_low.c: fixed 1200 dpi mode
* backend/umax_pp: changes for translations support
* po/Makefile.in po/umax_pp.fr.po: create french translations for
* po/Makefile.in po/umax_pp.fr.po: create french translations for
umax_pp backend
2002-03-12 Frank Zago <fzago@greshamstorage.com>
* PROJECTS backend/teco.desc: new project
@@ -774,7 +774,7 @@ i
2002-03-10 Frank Zago <fzago@greshamstorage.com>
* PROJECTS: removed matsushita project.
* backend/sceptre.desc backend/matsushita.desc: updated the backend
* backend/sceptre.desc backend/matsushita.desc: updated the backend
url.
2002-03-10 Abel Deuring <a.dering@satzbau-gmbh.de>
@@ -805,7 +805,7 @@ i
* po/plustek.de.po: Update
* po/plustek.es.po, po/saneopts.es.po: Added spanish translation
thanks to Gustavo D. Vranjes
thanks to Gustavo D. Vranjes
2002-03-10 Stéphane Voltz <svoltz@wanadoo.fr>
@@ -827,7 +827,7 @@ i
* include/sane/config.h.in: Fix comment for HAVE_USB_H.
* TODO: Added entry about md5/getopt license issues.
2002-03-07 Abel Deuring <a.deuring@satzbau-gmbh.de>
* sanei/sanei_scsi.c: fixed a typo (Sg_scsi_id -> SG_scsi_id)
@@ -840,22 +840,22 @@ i
* po/Makefile,in doc/sane.man doc/Makefile.in backend/matsushita.desc
backend/dll.conf backend/Makefile.in sane-backends.lsm AUTHORS
po/matsushita.fr.po doc/matsushita/matsushita.txt
doc/matsushita/matsushita10_trc.txt
po/matsushita.fr.po doc/matsushita/matsushita.txt
doc/matsushita/matsushita10_trc.txt
doc/matsushita/matsushita11_trc.txt
doc/matsushita/matsushita12_trc.txt
doc/matsushita/matsushita13_trc.txt
doc/matsushita/matsushita14_trc.txt
doc/matsushita/matsushita1_trc.txt
doc/matsushita/matsushita12_trc.txt
doc/matsushita/matsushita13_trc.txt
doc/matsushita/matsushita14_trc.txt
doc/matsushita/matsushita1_trc.txt
doc/matsushita/matsushita2_trc.txt
doc/matsushita/matsushita3_trc.txt
doc/matsushita/matsushita4_trc.txt
doc/matsushita/matsushita5_trc.txt
doc/matsushita/matsushita6_trc.txt
doc/matsushita/matsushita7_trc.txt
doc/matsushita/matsushita8_trc.txt
doc/matsushita/matsushita9_trc.txt doc/sane-matsushita.man
backend/matsushita.h backend/matsushita.conf
doc/matsushita/matsushita3_trc.txt
doc/matsushita/matsushita4_trc.txt
doc/matsushita/matsushita5_trc.txt
doc/matsushita/matsushita6_trc.txt
doc/matsushita/matsushita7_trc.txt
doc/matsushita/matsushita8_trc.txt
doc/matsushita/matsushita9_trc.txt doc/sane-matsushita.man
backend/matsushita.h backend/matsushita.conf
backend/matsushita.c: Addition of the Matsushita / Panasonic backend
* doc/.cvsignore: added sane-matsushita.5
@@ -892,7 +892,7 @@ i
backend/sceptre.conf backend/sceptre.desc backend/sceptre.h:
Added sceptre backend for the Sceptre VividScan 1200 (patch from
Frank Zago <fzago@greshamstorage.com>).
* doc/Makefile.in doc/sane-sceptre.5 doc/sane-sceptre.man doc/sane.man
* doc/Makefile.in doc/sane-sceptre.5 doc/sane-sceptre.man doc/sane.man
doc/sceptre/preview_trace.txt doc/sceptre/s1200.txt
doc/sceptre/scan_trace.txt: Added documentation for sceptre backend
(patch from Frank Zago <fzago@greshamstorage.com>).
@@ -912,25 +912,25 @@ i
* lib/inet_pton.c: Use u_int32_t instead of in in_addr_t which isn't
defined at least for OS/2.
* TODO: Added entry about DBG warnings.
* doc/sane.tex: Added some vendors (Abaton, Acer, Apple, Avision,
CANON, Fujitsu, IBM, NEC, Nikon, Plustek, Polaroid, Ricoh, Sharp,
* doc/sane.tex: Added some vendors (Abaton, Acer, Apple, Avision,
CANON, Fujitsu, IBM, NEC, Nikon, Plustek, Polaroid, Ricoh, Sharp,
Siemens, Tamarack) and device types (film scanner, sheetfed scanner)
to the SANE standard. Updated date.
* doc/Makefile.in: Remove sanei-html in make distclean.
* PROJECTS: Added Acer ScanWit 2720S.
* backend/template.desc.: Added explanation for backend version, fixed
typo.
typo.
2002-02-16 Abel Deuring <a.deuring@satzbau-gmbh.de>:
* frontend/scanimage.c / part for the "-f" command line option:
replaced the vprintf call with a loop of printf calls; fixed
a "too stingy" malloc
a "too stingy" malloc
2002-02-16 Peter Fales <peter@fales.com>
* backend/dc240.c - Fix mismatches between format and
* backend/dc240.c - Fix mismatches between format and
parameters in debug statements
2002-02-15 Henning Meier-Geinitz <henning@meier-geinitz.de>
* include/sane/sanei.h include/sane/sanei_ab306.h
@@ -948,14 +948,14 @@ i
* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.h
backend/umax_pp_mid.c backend/umax_pp.c backend/umax_pp.h
backend/umax_pp.conf: added ppdev character device name passing
from conf file. Allow model overide from conf option. DBG macros
clean-up. Fixed color inversion for 1660P models. Fixed potential
backend/umax_pp.conf: added ppdev character device name passing
from conf file. Allow model overide from conf option. DBG macros
clean-up. Fixed color inversion for 1660P models. Fixed potential
crash when custom dump files could not be opened for writing.
* doc/sane-umax_pp.man: updates to match backned new parameter and
* doc/sane-umax_pp.man: updates to match backned new parameter and
behaviour
* tools/umax_pp.c: added device name argument
2002-02-14 Jochen Eisinger <jochen.eisinger@gmx.net>
* sanei/sanei_auth.h: remove strange line-ending handling code
@@ -982,7 +982,7 @@ i
* configure, acinclude.m4, aclocal.m4 - Another tweak to the
allowed gphoto2 version numbers
2002-02-13 Henning Meier-Geinitz <henning@meier-geinitz.de>
* configure configure.in Makefile.in backend/Makefile.in
@@ -1001,7 +1001,7 @@ i
* frontend/saned.c: DNS queries for remote hosts are only done if
necessary. It's now possible to use "+" without hosts/DNS entries
for the connecting host.
* TODO: Removed entries for config.h, OpenBSD shared libs, and -ansi
* TODO: Removed entries for config.h, OpenBSD shared libs, and -ansi
on HP-UX. Updated device type entry.
2002-02-10 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -1043,13 +1043,13 @@ i
2002-02-05 Stéphane Voltz <svoltz@wanadoo.fr>
* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.h
backend/umax_pp_mid.c backend/umax_pp.c backend/umax_pp.h:
backend/umax_pp_mid.c backend/umax_pp.c backend/umax_pp.h:
tuned down duration of pauses in scanner ringing. Indent'ing all
files. Include header files according to HAVE_XXX_H defines in
config.h .
* tools/umax_pp.c: updated version and added printing of config
options
2002-02-05 Henning Meier-Geinitz <henning@meier-geinitz.de>
* configure configure.in: Version is 1.0.7-cvs. Enable warnings by
ChangeLogs/ChangeLog-1.0.9
+63 -63
View File
@@ -24,7 +24,7 @@
2002-10-19 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions-external/tevion9693usb.desc: Added Trust
* doc/descriptions-external/tevion9693usb.desc: Added Trust
Easy Webscan 19200.
---- CODE FREEZE FOR SANE 1.0.9 ---
@@ -123,7 +123,7 @@
2002-10-09 Stéphane Voltz <svoltz@wanadoo.fr>
* backend/umax_pp.c: disable scanner protocol debug facility
2002-10-08 Karl Heinz Kremer <khk@khk.net>
* backend/epson.c: force color channel re-order for GT-2200 scanner
@@ -145,7 +145,7 @@
2002-10-05 Karl Heinz Kremer <khk@khk.net>
* backend/epson.c: Fixed problem with incorrect response to
* backend/epson.c: Fixed problem with incorrect response to
sane_get_parameters() in certain situations.
2002-10-04 Jochen Eisinger <jochen.eisinger@gmx.de>
@@ -157,7 +157,7 @@
* backend/plustek.conf fixed option enableTPA
* po/plustek.de.po po/plustek.es.po removed "Negative"
* backend/plustek.c backend/plustek-devs.c backend/plustek-usb.c
* backend/plustek.c backend/plustek-devs.c backend/plustek-usb.c
backend/plustek-usbhw.c backend/plustek-usbimg.c
backend/plustek-usbmap.c backend/plustek-usbscan.c
backend/plustek-usbshading.c
@@ -187,7 +187,7 @@
2002-10-02 Matto Marjanovic <maddog@mir.com>
* doc/descriptions/microtek.desc: Updated version number.
* backend/microtek.c:
* backend/microtek.c:
Fixed bug in sane_read() [had failed to set return length to zero
in non-STATUS_GOOD conditions].
Fixed bug in sane_set_io_mode() [had returned SANE_STATUS_UNSUPPORTED
@@ -199,7 +199,7 @@
* doc/descriptions-external/gt68xx.desc: Added new scanners. Updated
status of supported scanners.
* doc/sane.tex: Added explanation of bit order for 1 bit modes. Added
comment about 1 bit color modes. Fixed missing \code command. New
comment about 1 bit color modes. Fixed missing \code command. New
version: 1.03.
* doc/backend-writing.txt: Added paragraph about checking geometry
(from TODO).
@@ -215,8 +215,8 @@
only works on linux (because need of USB control messages)
2002-09-30 Matthew Duggan <stauff1@users.sourceforge.net>
* backend/canon_pp.c backend/canon_pp-dev.c backend/canon_pp-dev.h:
Finally fixed cancelling, which I broke some time ago in the quest
* backend/canon_pp.c backend/canon_pp-dev.c backend/canon_pp-dev.h:
Finally fixed cancelling, which I broke some time ago in the quest
for speed. FB620P still doesn't abort nicely (firmware bug?).
* doc/sane-canon_pp.man: Added notes on FB620P problems.
* doc/descriptions/canon_pp.desc: Bumped version number.
@@ -237,7 +237,7 @@
-- snapshot 1.0.9-pre1
2002-09-29 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/mustek_usb.desc: Added "ScanExpress" for all models
to avoid confusion with BearPaw models.
* Makefile.in: Added ChangeLog-1.0.6 ChangeLog-1.0.7 ChangeLog-1.0.8
@@ -278,7 +278,7 @@
* config.sub config.guess: Updated to current versions.
* doc/releases.txt: Added paragraph about the different freeze types
and a timetable.
2002-09-26 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* doc/snapscan.desc backend/snapscan.c backend/snapscan.h
@@ -301,11 +301,11 @@
* doc/descriptions-external/gt68xx.desc: Added some untested scanners.
Updated Mustek entries.
* TODO: Removed hpsj5s .desc file problem.
2002-09-22 Peter Fales <peter@fales-lorenz.net>
* doc/sane-dc25.man, backend/dc25.c, backend/dc25.h,
backend/gphoto2.c, backend/gphoto2.h, backend/dc240.c,
* doc/sane-dc25.man, backend/dc25.c, backend/dc25.h,
backend/gphoto2.c, backend/gphoto2.h, backend/dc240.c,
backend/dc240.h: Update authors email address
2002-09-19 Frank Zago <fzago at austin dot rr dot com>
@@ -330,7 +330,7 @@
* backend/fujitsu.c fujitsu.h fujitsu-scsi.h:
added m3092 support
* doc/descriptions/fujitsu doc/sane-fujitsu
added description
added description
2002-09-17 Matthew Duggan <stauff1@users.sourceforge.net>
* backend/canon_pp.c backend/canon_pp.h backend/canon_pp.conf:
@@ -338,11 +338,11 @@
* doc/sane-canon_pp.man : Added description of init_mode option.
2002-09-16 Matthew Duggan <stauff1@users.sourceforge.net>
* backend/canon_pp-dev.c backend/canon_pp-dev.h backend/canon_pp-io.c
* backend/canon_pp-dev.c backend/canon_pp-dev.h backend/canon_pp-io.c
backend/canon_pp-io.h backend/canon_pp.c backend/canon_pp.h:
Fix init problem, add changes to facilitate configurable wakeup mode
(for faster starts on FB320P and FB620P).
* doc/sane-canon_pp.man doc/descriptions/canon_pp.desc: Updates
* doc/sane-canon_pp.man doc/descriptions/canon_pp.desc: Updates
regarding FB310P and FB610P (rebadged Avisions)
2002-09-16 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -350,7 +350,7 @@
* backend/.cvsignore frontend/.cvsignore tools/.cvsignore: Added .libs.
Patch from Sylvain Petreolle <spetreolle@yahoo.fr>.
* TODO: Added gt68xx project and viceo.desc entry.
* PROJECTS doc/descriptions-external/gt68xx.desc: Added gt68xx
* PROJECTS doc/descriptions-external/gt68xx.desc: Added gt68xx
information.
2002-09-15 Karl Heinz Kremer <khk@khk.net>
@@ -394,7 +394,7 @@
* TODO: Updated backend list. Added comments for additions to sane.tex.
Updated .desc file bug list. Removed scanimage entries. Added
plustek man page issue.
2002-09-10 Peter Kirchgessner <peter@kirchgessner.net>
* doc/sane-hp.man: Added hints about special USB device names
@@ -462,7 +462,7 @@
2002-09-01 Matthew Duggan <stauff1@users.sourceforge.net>
* backend/canon_pp.c backend/canon_pp-dev.c backend/canon_pp-dev.h
* backend/canon_pp.c backend/canon_pp-dev.c backend/canon_pp-dev.h
backend/canon_pp-io.c: Support for FB620P.
* doc/sane-canon_pp.man doc/descriptions/canon_pp.desc: Added notes
on support of FB620P
@@ -493,21 +493,21 @@
* backend/v4l.c backend/v4l.h doc/descriptions/v4l.desc:
Big clean up of Video for Linux backend. Removed old unused
stuff from qcam and others including unused options and variables
concerning direct port access. Removed wcam license (no
concerning direct port access. Removed wcam license (no
"substantial portions of code" are used any more). Removed
unuesed headers. Made lots of global variables local. Lots
of checks for null pointer dereferences and errors when opening
files or using ioctl/mmap. Added option to select grey or color
mode. Added support for different channels. Fixed lots of options.
Made sure ioctls are only used when necessary.
Made sure ioctls are only used when necessary.
Used vendor == "Noname". Added ??? comments for suspicious code.
Lots of minor fixes and cleanup. Added version number: 1.0-2.
* backend/v4l-grab.h: Deleted (unused).
* backend/Makefile.in: Removed v4l-grab.h.
* backend/Makefile.in: Removed v4l-grab.h.
* AUTHORS: Added myself as active maintainer of v4l.
* doc/sane-v4l.man: Added warning about ALPHA software and bugs.
Minor updates.
* doc/descriptions/bh.desc doc/descriptions/canon630u.desc
* doc/descriptions/bh.desc doc/descriptions/canon630u.desc
doc/descriptions/dmc.desc doc/descriptions/sm3600.desc
doc/descriptions/umax1220u.desc: Minor fixes and updates for the new
.desc file format.
@@ -575,8 +575,8 @@
2002-08-17 Karl Heinz Kremer <khk@khk.net>
* backend/epson.[ch]: Fixed typo in variable name. Fixed IEEE-1394
problem with Perfection-2450. Fixed problem with older B3 level
* backend/epson.[ch]: Fixed typo in variable name. Fixed IEEE-1394
problem with Perfection-2450. Fixed problem with older B3 level
SCSI scanners that do not support the extended status request.
2002-08-17 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
@@ -617,12 +617,12 @@
2002-08-07 Matthew Duggan <stauff1@users.sourceforge.net>
* backend/canon_pp.c backend/canon_pp-dev.c backend/caon_pp-io.c
backend/canon_pp-dev.h: Many changes: Bug fixes, less memory leaks
(none left now?), more reliable, faster. Biggest changes are
speculative reads (ask scanner to read more while data processing
backend/canon_pp-dev.h: Many changes: Bug fixes, less memory leaks
(none left now?), more reliable, faster. Biggest changes are
speculative reads (ask scanner to read more while data processing
occurs) and more reliable sending of commands. Slight performance
increase over previous version.
* doc/sane-canon_pp.man: Added discussion noting that scanning
* doc/sane-canon_pp.man: Added discussion noting that scanning
greyscale in green is bad for colour.
2002-08-07 Peter Kirchgessner <peter@kirchgessner.net>
@@ -650,7 +650,7 @@
msgids. Made sure that header is not marked fuzzy.
* Makefile.in doc/Makefile.in japi/Makefile.in tools/Makefile.in:
Minor DISTFILES and distclean updates.
* backend/mustek.c doc/descriptions/mustek.desc
* backend/mustek.c doc/descriptions/mustek.desc
doc/mustek/mustek.CHANGES: Fixed some warnings.
* TODO: Removed entries about "echo -e" and po problems.
@@ -668,7 +668,7 @@
2002-07-25 Matthew Duggan <stauff1@users.sourceforge.net>
* backend/canon_pp.c: Now always uses as much scanner buffer as
possible, then feeds data to frontend. Results in large speed
possible, then feeds data to frontend. Results in large speed
increase in ECP mode. Also fixed problems with saned compatibility.
* backend/canon_pp.h: Added bytes_sent to scanner data structure.
* doc/sane-canon_pp.man: Discuss hardware problems at high
@@ -739,7 +739,7 @@
2002-07-22 Matto Marjanovic <maddog@mir.com>
* doc/descriptions/microtek.desc:
* doc/descriptions/microtek.desc:
Updated (status keywords, mostly).
* backend/microtek.c:
* backend/microtek.h:
@@ -761,8 +761,8 @@
2002-07-23 Matthew Duggan <stauff1@users.sourceforge.net>
* doc/descriptions/canon_pp.desc: Added "N640P ex" model to supported
scanners after report of successful test. Also, "EPP" really should
* doc/descriptions/canon_pp.desc: Added "N640P ex" model to supported
scanners after report of successful test. Also, "EPP" really should
have been "ECP".
2002-07-22 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -787,7 +787,7 @@
* tools/sane-desc.c: Models are sorted alphanumerically now. Added
support for priorities if one model is mentioned by two backends.
Don't print tables when no suitable backend was found.
More comments. Fixed some warnings. Code cleanup.
More comments. Fixed some warnings. Code cleanup.
* doc/Makefile.in: Added support for sane-desc.c.
* doc/backend-writing.txt: Updated concerning sane-desc.c.
* backend/mustek_usb.c backend/mustek_usb_high.h
@@ -822,17 +822,17 @@
more expressive. Check for missing config descriptors before
using them to avoid segfaults.
* README.openbsd: Updated concerning USB scanners.
* README.openbsd README.netbsd: New files. Added some information
* README.openbsd README.netbsd: New files. Added some information
about SCSI and USB problems.
* tools/sane-find-scanner.c: Made verbosity option more flexible and
added quiet option. In quiet mode, print only the devices we have
added quiet option. In quiet mode, print only the devices we have
found. Don't check USB devices with SCSI functions and vice versa if
option force is not given. Don't do the libusb scan if an explicit
device name was given.
* doc/sane-usb.man: Updated supported platforms list. Minor wording
improvements.
* doc/sane-find-scanner.man: Documentation for the new options.
Splitted USB and SCSI parts.
Splitted USB and SCSI parts.
* doc/descriptions/hpsj5s.desc: Added missing space in ":new :yes"
line.
* TODO: Added entry about desc files. Removed entries about
@@ -841,20 +841,20 @@
types and OS X in sanei_scsi.c.
2002-07-13 Simon Munton <simon@munton.demon.co.uk>
* doc/descriptions/pie.desc: removed unsupported scanner types,
* doc/descriptions/pie.desc: removed unsupported scanner types,
use :status :untested for untested models, added AdLib scanners
that are supported
2002-07-13 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* backend/snapscan.c backend/snapscan.h
* backend/snapscan.c backend/snapscan.h
backend/snapscan-options.c backend/snapscan-usb.c
backend/snapscan-scsi.c backend/snapscan.conf:
backend/snapscan-scsi.c backend/snapscan.conf:
Snapscan backend version 1.4.15
- Improve support for Acer / Benq 5300
- use usb_sanei_read_bulk() and usb_sanei_write_bulk()
- correct scan area for e52 with TPO
* doc/description/snapscan.desc:
- correct scan area for e52 with TPO
* doc/description/snapscan.desc:
- Adapted file to new syntax
- Mark most scanners as "stable"
@@ -891,9 +891,9 @@
* doc/descriptions/sp15c.desc: Added missing slash in URL.
* doc/descriptions/fujitsu.desc: Changed status to :beta. Added
some URLs.
* frontend/Makefile.in: Use LIBS = @LIBS@ to make sure that
* frontend/Makefile.in: Use LIBS = @LIBS@ to make sure that
-lsyslog and -lsocket are linked for OS/2.
* doc/descriptions/abaton.desc: Added :status :untested for
* doc/descriptions/abaton.desc: Added :status :untested for
Scan 300/S.
* doc/descriptions/agfafocus.desc: Added status and comments (from
the manpage).
@@ -904,8 +904,8 @@
* doc/descriptions/net.desc doc/descriptions/test.desc: No bugs for
quite some time, changed status to stable (knocking on wood).
Updated comments.
* doc/descriptions.txt doc/descriptions/template.desc.
doc/descriptions-external/template.desc.: Updated concerning
* doc/descriptions.txt doc/descriptions/template.desc.
doc/descriptions-external/template.desc.: Updated concerning
model status.
* tools/sane-desc.c: Added support for :status :unsupported.
@@ -918,7 +918,7 @@
* backend/mustek.c doc/descriptions/mustek.desc
doc/mustek/mustek.CHANGES: Increased width and height of Paragon
800 and 600.
* doc/descriptions/mustek_usb.desc: Changed status to stable
* doc/descriptions/mustek_usb.desc: Changed status to stable
(knocking on wood...). Added more Mustek URLs, fixed the existing
one. Added per-model status. Added "compatible" comments.
* doc/descriptions/mustek.desc: Fixed Mustek URL. Added Trust comment
@@ -958,13 +958,13 @@
lists from the backends' .desc files.
* doc/sane.man: Added security to the list of topics that can be
reported to me.
* doc/descripions/template.desc.
* doc/descripions/template.desc.
doc/descriptions-external/template.desc.: Updated concerning ":new".
2002-07-03 Henning Meier-Geinitz <henning@meier-geinitz.de>
* configure configure.in include/sane/config.h.in: Added HAVE_LIBUSB
#define. Check for usb_get_busses to make sure, we have at least
#define. Check for usb_get_busses to make sure, we have at least
version 0.1.6. Added OS/2 substitution for strncasecmp.
* include/sane/sanei_usb.h sanei/sanei_usb.c: Added support for libusb.
* README.netbsd: Removed. Shared libraries are supported since 1.0.8.
@@ -974,7 +974,7 @@
* include/sane/sanei_usb.h sanei/sanei_usb.c: Used dn (device number)
instead of fd (file descriptor) to avoid confusion. Updated doxygen
documentation.
* doc/sane-usb.man: Updated concerning libusb. Added tips for access
* doc/sane-usb.man: Updated concerning libusb. Added tips for access
via the kernel scanner drivers.
2002-06-29 Matthew Duggan <stauff1@users.sourceforge.net>
@@ -985,7 +985,7 @@
2002-06-28 Henning Meier-Geinitz <henning@meier-geinitz.de>
* tools/sane-find-scanner.c: For HP-UX, check the complete
* tools/sane-find-scanner.c: For HP-UX, check the complete
/dev/rscsi/ directory for SCSI sscanners, not only the device
files for the first two host adapters.
* TODO: Added entries about sanei_usb/ibusb, config.h/OS/2, echo -e
@@ -994,10 +994,10 @@
2002-06-27 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/sane-fujitsu.man doc/sane-tamarack.man: Added newline at
* doc/sane-fujitsu.man doc/sane-tamarack.man: Added newline at
the end to keep Solaris' sed happy.
* sanei/sanei_scsi.c: Set buffer size to 64 kB for
SOLARIS_USCSI_INTERFACE (reported by Ed Randall
* sanei/sanei_scsi.c: Set buffer size to 64 kB for
SOLARIS_USCSI_INTERFACE (reported by Ed Randall
<ed.randall@ingenotech.com>).
2002-06-25 Henning Meier-Geinitz <henning@meier-geinitz.de>
@@ -1010,7 +1010,7 @@
2002-06-21 Max Vorobiev <pcwizard@yandex.ru>
* backend/hpsj5s.c: added fcntl.h include directive.
2002-06-15 Andras Major <andras@users.sourceforge.net>
* doc/sane-coolscan2.man: corrected stupid mistake.
@@ -1035,7 +1035,7 @@
now stops if one of the essential headers isn't found.
* backend/dll.conf: Added entry for test backend (commented out).
* doc/backend-writing.txt: Mentioned descriptions.txt.
* bachend/test.c backend/test.conf backend/test.h
* bachend/test.c backend/test.conf backend/test.h
backend/test-picture.c doc/descriptions/test.desc doc/sane-test.man:
Added support for lineart mode with pixels_per_line not divisible by
8. Added support for padded image formats. Added documentation for
@@ -1043,7 +1043,7 @@
2002-06-07 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/mustek.c doc/descriptions/mustek.desc
* backend/mustek.c doc/descriptions/mustek.desc
doc/mustek/mustek.CHANGES: Fixed problem for Paragon 6000SP (color
and gray modes produced solid black images). Minor cleanups.
New version: 1.0-125.
@@ -1061,7 +1061,7 @@
* backend/umax_pp.c: reverted a change in color reordering for 1600P
* po/Makefile.in po/umax_pp.de.po: added german translation courtesy
of Heiko Schaefer <heiko@burmagroup.de>
2002-06-04 Rene Rebe <rene.rebe@gmx.net>
@@ -1073,15 +1073,15 @@
* backend/umax_pp_low.c: relaxed scanner detection not to fail on
some parports.
2002-06-02 Henning Meier-Geinitz <henning@meier-geinitz.de>
* configure configure.in backend/Makefile.in: Added option
* configure configure.in backend/Makefile.in: Added option
--disable-local-backends to configure. Only net and dll will be
compiled if set. Also a warning is printed.
* TODO: Removed entries about config.h.in macros and disabling local
backends.
2002-06-01 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/pnm.c-bad: Removed because it was out-of-date and buggy.
@@ -1104,7 +1104,7 @@
2002-05-30 Stéphane Voltz <svoltz@wanadoo.fr>
* backend/umax_pp_low.c backend/umax_pp.c: fixed 1600P detection,
* backend/umax_pp_low.c backend/umax_pp.c: fixed 1600P detection,
IRIX compile fixes, final bits of software lineart
2002-05-29 Henning Meier-Geinitz <henning@meier-geinitz.de>
INSTALL.linux
+1 -1
View File
@@ -142,7 +142,7 @@ $ make install
$ cd ~
$ scanimage > test.pnm
3. Advanced Installation Information
====================================
NEWS
+42 -42
View File
@@ -7,7 +7,7 @@ New with 1.0.27 (see Note 1), released 2017-05-22:
* 30+ new scanner models supported.
* Made libusb-1.0 the default for USB support (see Note 2).
* Switched code from C90 to C99 (Thanks to Volker Diels-Grabsch).
* Updated Linux USB3 workaround (see Note 3).
* Updated Linux USB3 workaround (see Note 3).
* Documentation and translation updates.
* Bugfixes (Avahi, threading, USB, ICC/PNG/JPEG, etc).
* Reduced compiler warnings, improved code (see Note 4).
@@ -17,7 +17,7 @@ skipped so that our development version numbers would more clearly be
an extension of the prior release. This should make packaging a little
easier for our downstream users.
Note 2: On all systems, the --enable-libusb* flags are now ignored.
Note 2: 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 enabled if possible and
disabled otherwise. If --with-usb is requested but not possible,
@@ -113,7 +113,7 @@ New with 1.0.21, released 2010-04-25:
New with 1.0.20, released 2009-05-03:
* New backends: canon_dr (Canon DR-series), coolscan3 (Nikon LS & Coolscan),
rts8891 (Umax & HP 44xx), xerox_mfp (Samsung/Xerox/Dell MFPs)
rts8891 (Umax & HP 44xx), xerox_mfp (Samsung/Xerox/Dell MFPs)
* Many backends updated.
* 75 more scanner models supported.
* New build system (thanks Chris and Olaf).
@@ -132,7 +132,7 @@ New with 1.0.20, released 2009-05-03:
New with 1.0.19, released 2008-02-10:
* New backends: cardscan (Corex Cardscan 800c), epjitsu (Epson-based Fujitsu),
* New backends: cardscan (Corex Cardscan 800c), epjitsu (Epson-based Fujitsu),
epson2 (various Epson scanners), hp3900 (HP ScanJet 3970 and more),
hp5590 (HP ScanJet 5590 and more), hpljm1005 (HP LaserJet M1005 and more),
hs2p (Ricoh IS400 series)
@@ -190,7 +190,7 @@ New with 1.0.16, released 2005-08-07:
* Updated backends: avision, canon, coolscan, epson, gphoto2, gt68xx, mustek,
mustek_pp, niash, plustek, plustek_pp, qcam, sm3600, snapscan, teco2,
umax_pp, v4l.
* More functionality/fixes for sanei_usb and sanei_pp.
* More functionality/fixes for sanei_usb and sanei_pp.
* Added sanei_access to allow locking of SANE devices.
* Hotplug updates.
* scanimage updates.
@@ -294,7 +294,7 @@ New with 1.0.10, released 2003-02-01:
New with 1.0.9, released 2002-10-24:
* New backends: hpsj5s (Hewlett-Packard ScanJet 5S parport scanner),
* New backends: hpsj5s (Hewlett-Packard ScanJet 5S parport scanner),
teco2 (some Relisys/Primax SCSI flatbed scanners, models VM3575, VM6565,
VM6586 and VM6575), teco3 (some Relisys/Piotech/Trust/Plustek SCSI
flatbed scanners, model VM3552).
@@ -314,9 +314,9 @@ New with 1.0.9, released 2002-10-24:
New with 1.0.8, released 2002-05-27:
* New backends: canon_pp (Canon parport scanners), canon630u (CanoScan 630u
* New backends: canon_pp (Canon parport scanners), canon630u (CanoScan 630u
+ 636u), coolscan2 (Nikon Coolscan LS-30, LS-40 ED, LS-4000 ED, and
LS-8000 ED), fujitsu (M3091, M3093, M3096 and similar scanners),
LS-8000 ED), fujitsu (M3091, M3093, M3096 and similar scanners),
leo (Leo/Across FS-1130 scanner), matsushita (Panasonic KV-SS scanners),
sceptre (Sceptre VividScan S1200), teco1 (some Teco/Relisys flatbed
scanners), test (test frontends and SANE installation).
@@ -341,7 +341,7 @@ New with 1.0.7, released 2002-02-04:
* Updated backends: avision (v 1.0.15), dc240 (v 0.0), dc25 (v 1.2),
dll (v 1.0.5), epson (v 1.0.219), gphoto2 (v 0.0), microtek2 (v 0.95),
mustek (1.0.118), mustek_usb (v 1.0.10), plustek (v 0.41), pnm (v 1.0.4),
sharp (v 0.32), snapscan (v 1.4.7), st400 (v 1.6), umax (v 1.0-32),
sharp (v 0.32), snapscan (v 1.4.7), st400 (v 1.6), umax (v 1.0-32),
umax_pp (v 1.0.6).
* Added support for translating backend options.
* Added support for USB control messages and lm983x and pv6830 chipsets.
@@ -357,7 +357,7 @@ New with 1.0.6, released 2001-11-05:
* New backends: gphoto2 (backend for gphoto2 supported cameras), mustek_usb
(for Mustek USB scanners 600CU, 1200CU(+), 1200UB).
* Updated backends: dc240 (v 0.0), epson (v 0.2.12), hp (0.95),
* Updated backends: dc240 (v 0.0), epson (v 0.2.12), hp (0.95),
m3096g (v 1.11), microtek2 (v 0.95), mustek (v1.0-113), net (v 1.0.5),
pie (1.0-7), pnm (1.0-2), snapscan (v 1.4.0), umax (1.0-31), umax_pp (1).
* Added generic support for USB devices.
@@ -475,22 +475,22 @@ New with 1.01:
Scanning from the ADF therefore should work now.
* Updated Microtek backend (by Matto Marjanovic)
o Fixed off-by-1 error in revision-number parsing.
o dump_inquiry() now prints the "Vendor Specific String".
o Added model code/vendor name for the other 600ZS.
o Fixed off-by-1 error in revision-number parsing.
o dump_inquiry() now prints the "Vendor Specific String".
o Added model code/vendor name for the other 600ZS.
o Made get_scan_status() retry delay increase with each try (will
this help the poor 600ZS?).
o Corrected base resolution for Agfa StudioScan II/IIsi (400dpi).
this help the poor 600ZS?).
o Corrected base resolution for Agfa StudioScan II/IIsi (400dpi).
o Disabled backend's clever aspect-ratio correction code for
expanded-mode scans with StudioScan II/IIsi (scanner handles it
internally - smart scanner.)
internally - smart scanner.)
o Fixed gamma LUT code parsing stupidity: now correctly
determines maximum allowed LUT size, and uses it. (Especially
necessary for StudioScan II/IIsi.)
necessary for StudioScan II/IIsi.)
o The E6 claims to only support 256-byte LUT's, but the backend
now ignores that misinformation (and uses 1024).
now ignores that misinformation (and uses 1024).
o Now ignores denial of expanded-mode by older E6's (model code
0x63), in addition to newer E6's.
0x63), in addition to newer E6's.
* Updated Microtek2 backend (by Bernd Schroeder)
o Added support for non-blocking I/O.
@@ -576,8 +576,8 @@ New with 1.00:
* Updated Microtek backend (by Matto Marjanovic).
- Fix segfault on exit due to unnecessary free() in sane_close().
- Fix to red channel shift bug (which crept in during rewrite of
color-handling code).
- Addition of "patch level" to version codes.
color-handling code).
- Addition of "patch level" to version codes.
* Updated Microtek2 backend
- Added support for ScanMaker 330, ScanMaker 636, ScanMaker E3plus,
@@ -606,25 +606,25 @@ New with 1.00:
- Resolutions >300dpi in color mode sometimes result in corrupted images
(parts duplicated/shifted *HORIZONTALLY*) depending on hardware
configuration. Killing all other applications and disabling swap
(if sufficient physical memory available) may help.
I added some code which writes to every page of the buffer prior
(if sufficient physical memory available) may help.
I added some code which writes to every page of the buffer prior
to scanning to fool the memory management and scanned a full page
color scan with 600dpi * 1200dpi. Very slow but image seemed ok
after pnmscale.
after pnmscale.
- Max. scan area: 0-216mm (hor.), 2.5-294.5mm (ver.)
The scanners can't scan the first 2.5mm (ver.), so you *MUST*
specify the scan area according to this restriction!
- The scanners support only lineart (1 bpp), gray (8 bpp), color (24 bpp).
Although the scanners have 10 bit (6000 SP) or 12 bit (12000 SP)
Although the scanners have 10 bit (6000 SP) or 12 bit (12000 SP)
A/D-converters, they can send only 8 bit values to the host.
The higher resolution may only be used via gamma table.
- For compatibility only 256 entry gamma tables may be specified, the
actual gamma table sent to the scanner is linearly interpolated from it.
- In lineart mode only brightness may be adjusted.
- In lineart mode only brightness may be adjusted.
- Cover open/closed reported only via debug output and ignored otherwise.
- Use of SCSI card supplied with scanner is *NOT* recommended. (Don't
forget termination!)
* Updated UMAX backend (by Oliver Rauch)
- added output of umax-backend-version in sane_init
- added Linotype Hell Jade2 (Vobis ScanBoostar Premium)
@@ -696,13 +696,13 @@ New with 0.74:
but the code is now leaner and cleaner.
o fixed the bugs that the backend didn't compile with non gcc compilers.
o added an option to control exposure times.
o rewrote the code that processes the data that is received from the
o rewrote the code that processes the data that is received from the
scanner and transfers it into the frontend buffer. The smallest unit of
data that can be copied into the frontend buffer is now a pixel, no
longer a complete line.
o added (a yet) undocumented option "strip-height" that allows to control
the number of lines that is read from the scanner with one "read image".
o fixed a bug that caused scanimage to sigsegv when calling sane_exit()
o fixed a bug that caused scanimage to sigsegv when calling sane_exit()
without having written all data into the output file.
o added code to support scanners with more than 8 bit output per color.
Due to the lack of such a scanner this functionality is COMPLETELY UNTESTED
@@ -727,20 +727,20 @@ New with 0.74:
* Updated Nikon Coolscan backend (by Didier Carlier).
* Updated UMAX backend (by Oliver Rauch):
o Cancelling a scan now works, cancelling a preview still makes problems!
o Cancelling a scan now works, cancelling a preview still makes problems!
o Preview fix is activated for Astra 600S, Astra 610S and Vista S6E
scanners. (calibration by driver still does not work for these scanners).
- removed button for preview patch
o Quality calibration / calibration by driver now works for same scanners.
- added selection for type of shading data calculation
o Solved problem with black area at top of the image
(happend only with some SCSI-adapters).
o Added gamma download format type 0 and type 1 for older scanners.
o Added Astra 1220S as supported scanner:
- added 36 gamma input bits support for Astra 1220S
scanners. (calibration by driver still does not work for these scanners).
- removed button for preview patch
o Quality calibration / calibration by driver now works for same scanners.
- added selection for type of shading data calculation
o Solved problem with black area at top of the image
(happend only with some SCSI-adapters).
o Added gamma download format type 0 and type 1 for older scanners.
o Added Astra 1220S as supported scanner:
- added 36 gamma input bits support for Astra 1220S
- added 36 output bits support, but there is no frontend that can
handle it!
o Added inquiry for Escom Image Scanner 256 (UMAX UG80).
handle it!
o Added inquiry for Escom Image Scanner 256 (UMAX UG80).
* OS/2 (by Yuri Dario):
o Updated SCSI support so sanei_scsi_find_devices is supported now.
@@ -786,7 +786,7 @@ New with 0.73:
- scalar gamma correction.
Options that are not yet supported include:
- 3-pass scanners
- more than 8 bit per color output data. Provisions are made here
and there in the code, to support more than 8 bit, but that's
README.aix
+1 -1
View File
@@ -1,7 +1,7 @@
Under AIX, you'll need the generic SCSI device driver gsc written by
Matthew Jacob <mjacob@feral.com> (nice piece of work!). When you
install this driver, copy the header file gscdds.h to /usr/include, as
we look for it there.
we look for it there.
Find this driver under:
ftp://ftp.feral.com/pub/aix/gsc.tar.gz
README.beos
+1 -1
View File
@@ -25,5 +25,5 @@ Compiler: gcc 2.95.3
User-level SCSI support: yes
USB support: yes
Shared library support: yes
Dynamic loading support: yes
Dynamic loading support: yes
X11 clients: no
README.djpeg
+1 -1
View File
@@ -2,7 +2,7 @@ The JPEG decoder in SANE is taken mostly without change from The
Independent JPEG Group's JPEG software, release 6a. Their "djpeg.README"
file is included below. The only changes are to file names, e.g.
djpeg.c -> sanei_jpeg.c, and function names,
e.g. sanei_jpeg_start_output_ppm()
e.g. sanei_jpeg_start_output_ppm()
The Independent JPEG Group's JPEG software
README.freebsd
+2 -2
View File
@@ -3,11 +3,11 @@ SANE and FreeBSD
Building:
---------
Don't forget to use GNU make (gmake). E.g. "MAKE=gmake ./configure".
Don't forget to use GNU make (gmake). E.g. "MAKE=gmake ./configure".
SANE should compile and install out-of-the-box.
If you've installed some of the optional libraries that sane-backends
can make use of (see README for list) using Ports then you will need to
can make use of (see README for list) using Ports then you will need to
let configure know about their locations:
MAKE=gmake CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./configure
README.hp-ux
+5 -5
View File
@@ -49,17 +49,17 @@ Class I H/W Path Driver S/W State H/W Type Description
==============================================================================
[...]
ext_bus 0 8/0/19/0 c720 CLAIMED INTERFACE Ultra Wide SCSI
target 0 8/0/19/0.6 tgt CLAIMED DEVICE
target 0 8/0/19/0.6 tgt CLAIMED DEVICE
disk 0 8/0/19/0.6.0 sdisk CLAIMED DEVICE IBM DDYS-T09170N
target 1 8/0/19/0.7 tgt CLAIMED DEVICE
target 1 8/0/19/0.7 tgt CLAIMED DEVICE
ctl 0 8/0/19/0.7.0 sctl CLAIMED DEVICE Initiator
[...]
ext_bus 1 8/16/5 c720 CLAIMED INTERFACE Built-in SCSI
target 4 8/16/5.1 tgt CLAIMED DEVICE
target 4 8/16/5.1 tgt CLAIMED DEVICE
unknown -1 8/16/5.1.0 UNCLAIMED UNKNOWN EPSON Perfection1640
target 2 8/16/5.2 tgt CLAIMED DEVICE
target 2 8/16/5.2 tgt CLAIMED DEVICE
disk 1 8/16/5.2.0 sdisk CLAIMED DEVICE TOSHIBA CD-ROM XM-5401TA
target 3 8/16/5.7 tgt CLAIMED DEVICE
target 3 8/16/5.7 tgt CLAIMED DEVICE
ctl 1 8/16/5.7.0 sctl CLAIMED DEVICE Initiator
[...]
README.linux
+10 -10
View File
@@ -68,7 +68,7 @@ Example:
# cat /proc/scsi/scsi
Host: scsi0 Channel: 00 Id: 06 Lun: 00
Vendor: SCANNER Model: Rev: 2.02
Type: Scanner ANSI SCSI revision: 01 CCS
Type: Scanner ANSI SCSI revision: 01 CCS
In this case the real vendor and scanner name are not shown (Mustek
Scannexpress 12000SP) but SANE will detect it nevertheless.
@@ -76,7 +76,7 @@ Scannexpress 12000SP) but SANE will detect it nevertheless.
If your scanner is supported by SANE, scanimage -L will list it now:
# scanimage -L
device mustek:/dev/scanner' is a Mustek ScanExpress 12000SP flatbed scanner
device mustek:/dev/scanner' is a Mustek ScanExpress 12000SP flatbed scanner
If this doesn't work you may have to add the right SCSI generic device name
to the configuration file. This should be documented in the man page for
@@ -85,7 +85,7 @@ your backend. To find out about the right SCSI device use sane-find-scanner:
# sane-find-scanner
found SCSI scanner "SCANNER 2.02" at /dev/scanner
found SCSI scanner "SCANNER 2.02" at /dev/sg0
found SCSI scanner "SCANNER 2.02" at /dev/sga
found SCSI scanner "SCANNER 2.02" at /dev/sga
It may help to set a symbolic link /dev/scanner to the respective device if
automatic detection does not work.
@@ -98,10 +98,10 @@ in devfs".
Adaptec 1542 SCSI adapter:
Using buffer sizes of more than 32768 bytes with the aha1542 driver can
lead to kernel panic with older kernels. To avoid this, run configure with
lead to kernel panic with older kernels. To avoid this, run configure with
the option --enable-scsibuffersize or set the environment variable
SANE_SG_BUFFERSIZE to 32768 before running scanimage or another frontend,
or download and install the SG driver 2.1.37 or newer from
SANE_SG_BUFFERSIZE to 32768 before running scanimage or another frontend,
or download and install the SG driver 2.1.37 or newer from
http://www.torque.net/sg.
idescsi:
@@ -110,10 +110,10 @@ idescsi:
SANE. If your scanner isn't found or you encounter segmentation faults
try to disable idescsi.
SCSI Direct IO: Recent versions of the Linux SG driver for the 2.4 kernels
support direct IO, i.e., the SCSI adapter's DMA chip copies data directly
to/from user memory. Direct IO reduces memory usage, but it can lead to
access conflicts, if a backend uses shared memory. SANE does not use
SCSI Direct IO: Recent versions of the Linux SG driver for the 2.4 kernels
support direct IO, i.e., the SCSI adapter's DMA chip copies data directly
to/from user memory. Direct IO reduces memory usage, but it can lead to
access conflicts, if a backend uses shared memory. SANE does not use
direct IO by default. If you want to use it, run
configure --enable-scsi-directio=yes
README.netbsd
+1 -1
View File
@@ -3,7 +3,7 @@ SANE and NetBSD
Building:
---------
Don't forget to use GNU make (gmake). E.g. "MAKE=gmake ./configure".
Don't forget to use GNU make (gmake). E.g. "MAKE=gmake ./configure".
SANE should compile and install out-of-the-box.
SCSI-scanners:
README.openbsd
+1 -1
View File
@@ -3,7 +3,7 @@ SANE and OpenBSD
Building:
---------
Don't forget to use GNU make (gmake). E.g. "MAKE=gmake ./configure".
Don't forget to use GNU make (gmake). E.g. "MAKE=gmake ./configure".
SANE should compile and install out-of-the-box.
If some libraries and headers (like libjpeg) are installed in /usr/local/, adding
README.os2
+17 -17
View File
@@ -21,19 +21,19 @@ SANE (actually EMX 0.9D fix 03).
SANE (Scanner Access Now Easy)
------------------------------
For more info about the SANE Project, please visit
For more info about the SANE Project, please visit
http://www.sane-project.org/
You should also check the main site for an updated list of supported scanners.
Note that I can't say you if your scanner is supported; check SANE homepage
Note that I can't say you if your scanner is supported; check SANE homepage
instead.
SUPPORT
-------
I'm sorry to tell you that it is hard for me to help you: if your scanner
I'm sorry to tell you that it is hard for me to help you: if your scanner
doesn't work or your problem can't be reproduced on my pc, there are high
choices that I can't fix the bug. Most problems are specific to same PC/scanner
combinations, and can't be solved without having a full developement enviroment
@@ -61,7 +61,7 @@ file, he is welcome (actually I'm using groff).
INSTALLATION
------------
If you already didn't it, install the correct driver for your scsi adapter.
If you already didn't it, install the correct driver for your scsi adapter.
The drivers has usually a .ADD extension and looks like
BASEDEV=AHA154X.ADD
@@ -71,7 +71,7 @@ directory, so you have only to add
BASEDEV=OS2ASPI.DMD /ALL
The /ALL switch is required only if you need to use other devices with
The /ALL switch is required only if you need to use other devices with
aspirout.sys, e.g. if you have a CD-RW and CDRecord/2 installed.
Last, add aspirout.sys to your config.sys
@@ -86,7 +86,7 @@ available on Hobbes or Leo as emxrt.zip.
find-scanner.exe can be used to recognize a scanner on the scsi bus. Then
you should edit your xxx.conf file and add the scanner address, a string like
b0t4l0. This can be simplified using autodetection: with autodetection you can
b0t4l0. This can be simplified using autodetection: with autodetection you can
use a string like
scsi EPSON
@@ -104,7 +104,7 @@ you should see your scanner following the list of internal devices:
pnm:0 pnm:1
If it is not present, check your scsi driver, the aspi driver OS2ASPI.DMD and
aspirout.sys; on Warp4 you can use the Hardware Manager to check scanner
aspirout.sys; on Warp4 you can use the Hardware Manager to check scanner
presence. Then look at your xxx.conf, maybe there is something wrong in the
text.
@@ -115,7 +115,7 @@ Once configured your system, create a proper .conf file (edit one of the
supplied templates) and run
scanimage -L
The output should be like
device `umax:b0t3l0' is a UMAX Vista-S8 flatbed scanner
@@ -131,8 +131,8 @@ A simple scan
will do a scan with default parameters. Run
scanimage -d umax --help
scanimage -d umax --help
to get a full list of available switches.
@@ -155,7 +155,7 @@ of scanimage.exe: here you have to add a list of valid saned servers.
Run
scanimage -L
The output is like this
device `umax:b0t3l0' is a UMAX Vista-S8 flatbed scanner
@@ -174,7 +174,7 @@ Be aware that this configuration shouldn't work: I have been unable to get it
working on my PC without running saned under the debugger PMGDB.
The correct syntax for running scanimage over the net is
scanimage -d net:HOSTNAME:umax:b0t3l0 > test.pnm
scanimage -d net:HOSTNAME:umax:b0t3l0 > test.pnm
where HOSTNAME is a valid DNS host name.
You can log server access using syslogd: if syslogd is running, saned will
@@ -199,10 +199,10 @@ Steps:
- unzip this file somewhere;
- copy src\* into sane-1.0.1;
- enter sane-1.0.1 directory;
- apply patches to original distribution:
- apply patches to original distribution:
[...\sane-1.0.1]gnupatch -p 0 < patch.os2
- run autoconf to rebuild the configure script
- edit configure and change autoconf default optimization flags;
- edit configure and change autoconf default optimization flags;
search for -O2 -m486 and change to your preferred settings;
- add the following line after :${LDFLAGS="...."}
: ${LIBS="-lsocket"}
@@ -211,15 +211,15 @@ Steps:
- run make (compiler warnings are ok);
- wait to complete all makes;
Remember to install a Unix like shell in your path; I use ksh.exe
renamed to sh.exe, and saved in d:\bin
Remember to install a Unix like shell in your path; I use ksh.exe
renamed to sh.exe, and saved in d:\bin
(that's because most unix scripts uses SHELL=/bin/sh)
You need also a compatible dl.a and syslog.a library; look in .\contrib
for a couple of simple sources.
Flags needed under EMX:
-Zsysv-signals enables signal management as in SystemV, otherwise emx
-Zsysv-signals enables signal management as in SystemV, otherwise emx
convention is used (and it is different from sysv).
-Zcrtdll link dynamically with EMXLIBCM.DLL;
README.solaris
+2 -2
View File
@@ -92,7 +92,7 @@ can be found in
To install it on a SPARC do:
cd /tmp
cd /tmp
get SCHILYscg.sparc.tar.Z
uncompress SCHILYscg.sparc.tar.Z
tar -xvf SCHILYscg.sparc.tar
@@ -105,7 +105,7 @@ NOTE: Be very careful with pkgadd as it does not check for the correct
For Solaris on an x86 do:
cd /tmp
cd /tmp
get SCHILYscg.i386.tar.Z
uncompress SCHILYscg.i386.tar.Z
tar -xvf SCHILYscg.i386.tar
README.unixware7
+49 -49
View File
@@ -1,79 +1,79 @@
SANE on UnixWare 7
==================
SANE on UnixWare 7
==================
The easiest way to get SANE working on a UnixWare 7.1.X system (UW 7.0.0
and 7.0.1 are not supported) is to download and install the SANE binary
distribution from SCOs Skunkware web site. The URL is:
The easiest way to get SANE working on a UnixWare 7.1.X system (UW 7.0.0
and 7.0.1 are not supported) is to download and install the SANE binary
distribution from SCOs Skunkware web site. The URL is:
ftp://ftp.sco.com/skunkware/uw7/Packages
ftp://ftp.sco.com/skunkware/uw7/Packages
Use the pkgadd command to install the files, e.g.:
Use the pkgadd command to install the files, e.g.:
# pkgadd -d `pwd`/sane-1.0.2.pkg
# pkgadd -d `pwd`/sane-1.0.2.pkg
A web page with further information specific to SANE on UnixWare 7 can be
found here:
A web page with further information specific to SANE on UnixWare 7 can be
found here:
http://www.sco.com/skunkware/sane/index.html
http://www.sco.com/skunkware/sane/index.html
However, please note that the SANE package that is available from the
Skunkware server will most likely contain the latest stable version of
SANE. Since SANE is continously being worked on, you might want to download
However, please note that the SANE package that is available from the
Skunkware server will most likely contain the latest stable version of
SANE. Since SANE is continously being worked on, you might want to download
the latest source from the Git repository and build the source yourself.
To build SANE on a UnixWare 7.1.X system the following packages are required:
To build SANE on a UnixWare 7.1.X system the following packages are required:
* make (GNU make)
* make (GNU make)
* glibs (contains gtk, glib, libjpeg, libpnm, libtiff etc.; only
necessary for frontends xscanimage, xcam, and xsane which are
distributed separately)
distributed separately)
The packages can be downloaded from the Skunkware ftp server (see URL above).
I've used the following versions to build sane-1.0.2:
The packages can be downloaded from the Skunkware ftp server (see URL above).
I've used the following versions to build sane-1.0.2:
* make-3.78.1.pkg
* glibs-2.0.3.pkg
* make-3.78.1.pkg
* glibs-2.0.3.pkg
If you want to include support for The Gimp (this is optional), you need to
install the gimp package, too. This is the version I've used:
If you want to include support for The Gimp (this is optional), you need to
install the gimp package, too. This is the version I've used:
* gimp-1.0.4.pkg
* gimp-1.0.4.pkg
GCC is not required. SANE compiles quite happily (and faster) with UnixWares
native C compiler.
GCC is not required. SANE compiles quite happily (and faster) with UnixWares
native C compiler.
Set the LD_RUN_PATH variable to add /usr/local/lib to the list of directories
to be searched by the dynamic linker:
Set the LD_RUN_PATH variable to add /usr/local/lib to the list of directories
to be searched by the dynamic linker:
$ LD_RUN_PATH=/usr/local/lib
$ export LD_RUN_PATH
$ LD_RUN_PATH=/usr/local/lib
$ export LD_RUN_PATH
Run the configure script as following:
Run the configure script as following:
$ LIBS="-lsdi" ./configure
$ LIBS="-lsdi" ./configure
(The sdi library contains the SCSI passthrough functions the UW7 port of SANE
uses to access the scanner from user space.)
(The sdi library contains the SCSI passthrough functions the UW7 port of SANE
uses to access the scanner from user space.)
Run gmake to build SANE:
Run gmake to build SANE:
$ gmake
$ gmake
SCSI access from user space requires special privileges. If you want users
without root perms to be able to use the scanner you can use the filepriv
command to change the privileges that are associated with the SANE
applications:
SCSI access from user space requires special privileges. If you want users
without root perms to be able to use the scanner you can use the filepriv
command to change the privileges that are associated with the SANE
applications:
# /sbin/filepriv -f driver -f sysops /usr/local/bin/scanimage
# /sbin/filepriv -f driver -f sysops /usr/local/bin/xscanimage
# /sbin/filepriv -f sysops /usr/local/bin/xcam
# /sbin/filepriv -f driver -f sysops /usr/local/bin/scanimage
# /sbin/filepriv -f driver -f sysops /usr/local/bin/xscanimage
# /sbin/filepriv -f sysops /usr/local/bin/xcam
If you have built SANE with support for The Gimp you might want to create
a symlink from the plug-in directory to the xscanimage and xcam binaries,
e.g.:
If you have built SANE with support for The Gimp you might want to create
a symlink from the plug-in directory to the xscanimage and xcam binaries,
e.g.:
# ln -s /usr/local/bin/xscanimage \
/usr/local/lib/gimp/1.0/plug-ins/xscanimage
# ln -s /usr/local/bin/xcam /usr/local/lib/gimp/1.0/plug-ins/xcam
# ln -s /usr/local/bin/xscanimage \
/usr/local/lib/gimp/1.0/plug-ins/xscanimage
# ln -s /usr/local/bin/xcam /usr/local/lib/gimp/1.0/plug-ins/xcam
Questions? Comments? Please send e-mail to jenss@sco.com or skunkware@sco.com!
README.zeta
+3 -3
View File
@@ -1,8 +1,8 @@
SANE and Zeta
-------------
The Zeta port is based on existing BeOS port, with some changes
to accomodate yellowTAB's internal build procedure, and some new
The Zeta port is based on existing BeOS port, with some changes
to accomodate yellowTAB's internal build procedure, and some new
conventions brought up by Zeta.
Cf. README.beos for more historical stuff.
@@ -22,5 +22,5 @@ Compiler: gcc 2.95.3
User-level SCSI support: yes
USB support: yes
Shared library support: yes
Dynamic loading support: yes
Dynamic loading support: yes
X11 clients: no
acinclude.m4
+33 -33
View File
@@ -40,7 +40,7 @@ if test "${ac_cv_c_compiler_gnu}" = "yes"; then
AS_HELP_STRING([--enable-warnings],
[turn on tons of compiler warnings (GCC only)]),
[
if eval "test x$enable_warnings = xyes"; then
if eval "test x$enable_warnings = xyes"; then
for flag in $EXTRA_WARNINGS; do
JAPHAR_GREP_AM_CFLAGS($flag, [ AM_CFLAGS="$AM_CFLAGS $flag" ])
done
@@ -97,7 +97,7 @@ AC_DEFUN([SANE_SET_AM_LDFLAGS],
esac
fi
AC_SUBST(STRICT_LDFLAGS)
case "${host_os}" in
case "${host_os}" in
aix*) #enable .so libraries, disable archives
AM_LDFLAGS="$AM_LDFLAGS -Wl,-brtl"
;;
@@ -180,7 +180,7 @@ AC_DEFUN([SANE_CHECK_IEEE1284],
AC_CHECK_HEADER(ieee1284.h, [
AC_CACHE_CHECK([for libieee1284 >= 0.1.5], sane_cv_use_libieee1284, [
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ieee1284.h>]], [[
struct parport p; char *buf;
struct parport p; char *buf;
ieee1284_nibble_read(&p, 0, buf, 1);
]])],
[sane_cv_use_libieee1284="yes"; IEEE1284_LIBS="-lieee1284"
@@ -234,7 +234,7 @@ AC_DEFUN([SANE_CHECK_PTHREAD],
LIBS="$save_LIBS"
],[ have_pthread=no; use_pthread=no ])
fi
if test $use_pthread = yes ; then
AC_DEFINE_UNQUOTED(USE_PTHREAD, "$use_pthread",
[Define if pthreads should be used instead of forked processes.])
@@ -257,9 +257,9 @@ AC_DEFUN([SANE_CHECK_PTHREAD],
# GPHOTO2 and dell1600n_net backends.
AC_DEFUN([SANE_CHECK_JPEG],
[
AC_CHECK_LIB(jpeg,jpeg_start_decompress,
AC_CHECK_LIB(jpeg,jpeg_start_decompress,
[
AC_CHECK_HEADER(jconfig.h,
AC_CHECK_HEADER(jconfig.h,
[
AC_MSG_CHECKING([for jpeglib - version >= 61 (6a)])
AC_EGREP_CPP(sane_correct_jpeg_lib_version_found,
@@ -268,7 +268,7 @@ AC_DEFUN([SANE_CHECK_JPEG],
#if JPEG_LIB_VERSION >= 61
sane_correct_jpeg_lib_version_found
#endif
], [sane_cv_use_libjpeg="yes"; JPEG_LIBS="-ljpeg";
], [sane_cv_use_libjpeg="yes"; JPEG_LIBS="-ljpeg";
AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
],)
],)
@@ -281,9 +281,9 @@ AC_DEFUN([SANE_CHECK_JPEG],
# Checks for tiff library dell1600n_net backend.
AC_DEFUN([SANE_CHECK_TIFF],
[
AC_CHECK_LIB(tiff,TIFFFdOpen,
AC_CHECK_LIB(tiff,TIFFFdOpen,
[
AC_CHECK_HEADER(tiffio.h,
AC_CHECK_HEADER(tiffio.h,
[sane_cv_use_libtiff="yes"; TIFF_LIBS="-ltiff"],)
],)
AC_SUBST(TIFF_LIBS)
@@ -345,7 +345,7 @@ AC_DEFUN([SANE_CHECK_LOCKING],
fi
if test $use_locking = yes ; then
INSTALL_LOCKPATH=install-lockpath
AC_DEFINE([ENABLE_LOCKING], 1,
AC_DEFINE([ENABLE_LOCKING], 1,
[Define to 1 if device locking should be enabled.])
else
INSTALL_LOCKPATH=
@@ -397,13 +397,13 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
[# If --with-gphoto2=no or --without-gphoto2, disable backend
# as "$with_gphoto2" will be set to "no"])
# If --with-gphoto2=yes (or not supplied), first check if
# If --with-gphoto2=yes (or not supplied), first check if
# pkg-config exists, then use it to check if libgphoto2 is
# present. If all that works, then see if we can actually link
# a program. And, if that works, then add the -l flags to
# GPHOTO2_LIBS and any other flags to GPHOTO2_LDFLAGS to pass to
# a program. And, if that works, then add the -l flags to
# GPHOTO2_LIBS and any other flags to GPHOTO2_LDFLAGS to pass to
# sane-config.
if test "$with_gphoto2" != "no" ; then
if test "$with_gphoto2" != "no" ; then
AC_CHECK_TOOL(HAVE_GPHOTO2, pkg-config, false)
if test ${HAVE_GPHOTO2} != "false" ; then
@@ -427,8 +427,8 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
HAVE_GPHOTO2=false
fi
if test "${HAVE_GPHOTO2}" = "false"; then
GPHOTO2_CPPFLAGS=""
GPHOTO2_LIBS=""
GPHOTO2_CPPFLAGS=""
GPHOTO2_LIBS=""
else
SANE_EXTRACT_LDFLAGS(GPHOTO2_LIBS, GPHOTO2_LDFLAGS)
if pkg-config --atleast-version=2.5.0 libgphoto2; then
@@ -448,31 +448,31 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
# Check for ss_family member in struct sockaddr_storage
AC_DEFUN([SANE_CHECK_IPV6],
[
AC_MSG_CHECKING([whether to enable IPv6])
AC_ARG_ENABLE(ipv6,
AC_MSG_CHECKING([whether to enable IPv6])
AC_ARG_ENABLE(ipv6,
AS_HELP_STRING([--disable-ipv6],[disable IPv6 support]),
[ if test "$enableval" = "no" ; then
AC_MSG_RESULT([no, manually disabled])
ipv6=no
AC_MSG_RESULT([no, manually disabled])
ipv6=no
fi
])
if test "$ipv6" != "no" ; then
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#define INET6
#include <sys/types.h>
#define INET6
#include <sys/types.h>
#include <sys/socket.h> ]], [[
/* AF_INET6 available check */
if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
exit(1);
else
exit(0);
/* AF_INET6 available check */
if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
exit(1);
else
exit(0);
]])],[
AC_MSG_RESULT(yes)
AC_DEFINE([ENABLE_IPV6], 1, [Define to 1 if the system supports IPv6])
AC_MSG_RESULT(yes)
AC_DEFINE([ENABLE_IPV6], 1, [Define to 1 if the system supports IPv6])
ipv6=yes
],[
AC_MSG_RESULT([no (couldn't compile test program)])
AC_MSG_RESULT([no (couldn't compile test program)])
ipv6=no
])
fi
@@ -507,7 +507,7 @@ AC_DEFUN([SANE_CHECK_IPV6],
ipv6=no
])
])
fi
fi
])
#
@@ -527,7 +527,7 @@ for be in ${BACKENDS}; do
case $be in
plustek_pp)
case "$host_os" in
gnu*)
gnu*)
echo "*** $be backend not supported on GNU/Hurd - $DISABLE_MSG"
backend_supported="no"
;;
@@ -555,7 +555,7 @@ for be in ${BACKENDS}; do
fi
;;
dell1600n_net)
dell1600n_net)
if test "${sane_cv_use_libjpeg}" != "yes" || test "${sane_cv_use_libtiff}" != "yes"; then
echo "*** $be backend requires JPEG and TIFF library - $DISABLE_MSG"
backend_supported="no"
backend/Makefile.am
+28 -28
View File
@@ -93,8 +93,8 @@ install-data-hook: install-becfg install-firmware-path $(INSTALL_LOCKPATH)
# files that have been previously installed so that user modifications
# are not lost.
install-becfg:
@# Libtool has a bug where it will sometimes symlink the last
@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.
@# Libtool has a bug where it will sometimes symlink the last
@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.
@# Having two libsane's can cause issues so get rid of it.
-rm -f $(DESTDIR)$(sanelibdir)/libsane.*
test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
@@ -217,7 +217,7 @@ COMMON_LIBS = ../lib/liblib.la
# all related files within backend directory. General guideline
# is to have a ${backend}.c and ${backend}.h. Some backends also
# add a few support source files to convience library.
# Note: automake doesn't really use header files listed here.
# Note: automake doesn't really use header files listed here.
# They are indications that they need to be distributed only.
libabaton_la_SOURCES = abaton.c abaton.h
libabaton_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=abaton
@@ -228,7 +228,7 @@ libabaton_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=abaton
# Also, it will need to link in related convenience library as well as
# any external libraries required to resolve symbols.
#
# All backends should include $(DIST_SANELIBS_LDFLAGS) so that
# All backends should include $(DIST_SANELIBS_LDFLAGS) so that
# library is correctly versioned.
#
# If a backend has a config file, it must be listed here to get distributed.
@@ -239,10 +239,10 @@ libsane_abaton_la_LIBADD = $(COMMON_LIBS) libabaton.la ../sanei/sanei_init_debug
EXTRA_DIST += abaton.conf.in
libagfafocus_la_SOURCES = agfafocus.c agfafocus.h
libagfafocus_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=agfafocus
libagfafocus_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=agfafocus
nodist_libsane_agfafocus_la_SOURCES = agfafocus-s.c
libsane_agfafocus_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=agfafocus
libsane_agfafocus_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=agfafocus
libsane_agfafocus_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_agfafocus_la_LIBADD = $(COMMON_LIBS) libagfafocus.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_thread.lo ../sanei/sanei_scsi.lo $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
EXTRA_DIST += agfafocus.conf.in
@@ -280,12 +280,12 @@ libas6e_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=as6e
nodist_libsane_as6e_la_SOURCES = as6e-s.c
libsane_as6e_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=as6e
libsane_as6e_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_as6e_la_LIBADD = $(COMMON_LIBS) libas6e.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo
libsane_as6e_la_LIBADD = $(COMMON_LIBS) libas6e.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo
libavision_la_SOURCES = avision.c avision.h
libavision_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=avision
nodist_libsane_avision_la_SOURCES = avision-s.c
nodist_libsane_avision_la_SOURCES = avision-s.c
libsane_avision_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=avision
libsane_avision_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_avision_la_LIBADD = $(COMMON_LIBS) libavision.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_thread.lo ../sanei/sanei_scsi.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
@@ -303,7 +303,7 @@ EXTRA_DIST += bh.conf.in
libcanon_la_SOURCES = canon.c canon.h
libcanon_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=canon
nodist_libsane_canon_la_SOURCES = canon-s.c
nodist_libsane_canon_la_SOURCES = canon-s.c
libsane_canon_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=canon
libsane_canon_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_canon_la_LIBADD = $(COMMON_LIBS) libcanon.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_scsi.lo $(MATH_LIB) $(SCSI_LIBS) $(RESMGR_LIBS)
@@ -325,7 +325,7 @@ EXTRA_DIST += canon630u-common.c lm9830.h
libcanon_dr_la_SOURCES = canon_dr.c canon_dr.h canon_dr-cmd.h
libcanon_dr_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=canon_dr
nodist_libsane_canon_dr_la_SOURCES = canon_dr-s.c
nodist_libsane_canon_dr_la_SOURCES = canon_dr-s.c
libsane_canon_dr_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=canon_dr
libsane_canon_dr_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_canon_dr_la_LIBADD = $(COMMON_LIBS) libcanon_dr.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_magic.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
@@ -486,7 +486,7 @@ EXTRA_DIST += genesys_conv.c genesys_conv_hlp.c genesys_devices.c
libgphoto2_i_la_SOURCES = gphoto2.c gphoto2.h
libgphoto2_i_la_CPPFLAGS = $(AM_CPPFLAGS) $(GPHOTO2_CPPFLAGS) -DBACKEND_NAME=gphoto2
nodist_libsane_gphoto2_la_SOURCES = gphoto2-s.c
nodist_libsane_gphoto2_la_SOURCES = gphoto2-s.c
libsane_gphoto2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=gphoto2
libsane_gphoto2_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_gphoto2_la_LIBADD = $(GPHOTO2_LDFLAGS) $(COMMON_LIBS) libgphoto2_i.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo $(SANEI_SANEI_JPEG_LO) $(GPHOTO2_LIBS) $(JPEG_LIBS)
@@ -495,7 +495,7 @@ EXTRA_DIST += gphoto2.conf.in
libgt68xx_la_SOURCES = gt68xx.c gt68xx.h
libgt68xx_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=gt68xx
nodist_libsane_gt68xx_la_SOURCES = gt68xx-s.c
nodist_libsane_gt68xx_la_SOURCES = gt68xx-s.c
libsane_gt68xx_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=gt68xx
libsane_gt68xx_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_gt68xx_la_LIBADD = $(COMMON_LIBS) libgt68xx.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(MATH_LIB) $(USB_LIBS) $(RESMGR_LIBS)
@@ -536,7 +536,7 @@ EXTRA_DIST += hp3900_config.c hp3900_debug.c hp3900_rts8822.c hp3900_sane.c hp39
libhp4200_la_SOURCES = hp4200.c hp4200.h
libhp4200_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=hp4200
nodist_libsane_hp4200_la_SOURCES = hp4200-s.c
nodist_libsane_hp4200_la_SOURCES = hp4200-s.c
libsane_hp4200_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=hp4200
libsane_hp4200_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_hp4200_la_LIBADD = $(COMMON_LIBS) libhp4200.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_pv8630.lo $(MATH_LIB) $(USB_LIBS) $(RESMGR_LIBS)
@@ -576,7 +576,7 @@ libsane_hpljm1005_la_LIBADD = $(COMMON_LIBS) libhpljm1005.la ../sanei/sanei_init
libhpsj5s_la_SOURCES = hpsj5s.c hpsj5s.h
libhpsj5s_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=hpsj5s
nodist_libsane_hpsj5s_la_SOURCES = hpsj5s-s.c
nodist_libsane_hpsj5s_la_SOURCES = hpsj5s-s.c
libsane_hpsj5s_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=hpsj5s
libsane_hpsj5s_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_hpsj5s_la_LIBADD = $(COMMON_LIBS) libhpsj5s.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo $(IEEE1284_LIBS)
@@ -585,7 +585,7 @@ EXTRA_DIST += hpsj5s.conf.in
libhs2p_la_SOURCES = hs2p.c hs2p.h hs2p-saneopts.h
libhs2p_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=hs2p
nodist_libsane_hs2p_la_SOURCES = hs2p-s.c
nodist_libsane_hs2p_la_SOURCES = hs2p-s.c
libsane_hs2p_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=hs2p
libsane_hs2p_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_hs2p_la_LIBADD = $(COMMON_LIBS) libhs2p.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_scsi.lo $(SCSI_LIBS) $(RESMGR_LIBS)
@@ -633,7 +633,7 @@ libsane_kvs1025_la_LIBADD = $(COMMON_LIBS) libkvs1025.la ../sanei/sanei_init_deb
EXTRA_DIST += kvs1025.conf.in
libkvs20xx_la_SOURCES = kvs20xx.c kvs20xx_cmd.c kvs20xx_opt.c \
kvs20xx_cmd.h kvs20xx.h
kvs20xx_cmd.h kvs20xx.h
libkvs20xx_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kvs20xx
nodist_libsane_kvs20xx_la_SOURCES = kvs20xx-s.c
@@ -642,7 +642,7 @@ libsane_kvs20xx_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_kvs20xx_la_LIBADD = $(COMMON_LIBS) libkvs20xx.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo $(SCSI_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
libkvs40xx_la_SOURCES = kvs40xx.c kvs40xx_cmd.c kvs40xx_opt.c \
kvs40xx.h
kvs40xx.h
libkvs40xx_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kvs40xx
nodist_libsane_kvs40xx_la_SOURCES = kvs40xx-s.c
@@ -662,7 +662,7 @@ EXTRA_DIST += leo.conf.in
liblexmark_la_SOURCES = lexmark.c lexmark.h lexmark_low.c
liblexmark_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=lexmark
nodist_libsane_lexmark_la_SOURCES = lexmark-s.c
nodist_libsane_lexmark_la_SOURCES = lexmark-s.c
libsane_lexmark_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=lexmark
libsane_lexmark_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_lexmark_la_LIBADD = $(COMMON_LIBS) liblexmark.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(USB_LIBS) $(RESMGR_LIBS)
@@ -735,12 +735,12 @@ libsane_mustek_pp_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_mustek_pp_la_LIBADD = $(COMMON_LIBS) libmustek_pp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_pa4s2.lo $(MATH_LIB) $(IEEE1284_LIBS)
EXTRA_DIST += mustek_pp.conf.in
# TODO: Why are these distributed but not compiled?
EXTRA_DIST += mustek_pp_ccd300.c mustek_pp_ccd300.h mustek_pp_cis.c mustek_pp_cis.h mustek_pp_null.c
EXTRA_DIST += mustek_pp_ccd300.c mustek_pp_ccd300.h mustek_pp_cis.c mustek_pp_cis.h mustek_pp_null.c
libmustek_usb_la_SOURCES = mustek_usb.c mustek_usb.h
libmustek_usb_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=mustek_usb
nodist_libsane_mustek_usb_la_SOURCES = mustek_usb-s.c
nodist_libsane_mustek_usb_la_SOURCES = mustek_usb-s.c
libsane_mustek_usb_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=mustek_usb
libsane_mustek_usb_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_mustek_usb_la_LIBADD = $(COMMON_LIBS) libmustek_usb.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(USB_LIBS) $(RESMGR_LIBS)
@@ -789,7 +789,7 @@ EXTRA_DIST += niash_core.c niash_core.h niash_xfer.c niash_xfer.h
libpie_la_SOURCES = pie.c pie-scsidef.h
libpie_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pie
nodist_libsane_pie_la_SOURCES = pie-s.c
nodist_libsane_pie_la_SOURCES = pie-s.c
libsane_pie_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pie
libsane_pie_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_pie_la_LIBADD = $(COMMON_LIBS) libpie.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_scsi.lo ../sanei/sanei_thread.lo $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
@@ -819,7 +819,7 @@ libpint_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pint
nodist_libsane_pint_la_SOURCES = pint-s.c
libsane_pint_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pint
libsane_pint_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_pint_la_LIBADD = $(COMMON_LIBS) libpint.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo
libsane_pint_la_LIBADD = $(COMMON_LIBS) libpint.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo
libpixma_la_SOURCES = pixma.c pixma.h pixma_io_sanei.c pixma_io.h pixma_common.c pixma_common.h pixma_mp150.c pixma_mp730.c pixma_mp750.c pixma_mp810.c pixma_imageclass.c pixma_bjnp.c pixma_bjnp.h pixma_bjnp_private.h pixma_rename.h
libpixma_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pixma
@@ -856,10 +856,10 @@ EXTRA_DIST += plustek-pp_dac.c plustek-pp_dbg.h plustek-pp_detect.c plustek-pp_g
libpnm_la_SOURCES = pnm.c
libpnm_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pnm
nodist_libsane_pnm_la_SOURCES = pnm-s.c
nodist_libsane_pnm_la_SOURCES = pnm-s.c
libsane_pnm_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pnm
libsane_pnm_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_pnm_la_LIBADD = $(COMMON_LIBS) libpnm.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo
libsane_pnm_la_LIBADD = $(COMMON_LIBS) libpnm.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo
libqcam_la_SOURCES = qcam.c qcam.h
libqcam_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=qcam
@@ -963,7 +963,7 @@ EXTRA_DIST += sp15c.conf.in
libst400_la_SOURCES = st400.c st400.h
libst400_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=st400
nodist_libsane_st400_la_SOURCES = st400-s.c ../sanei/sanei_scsi.lo
nodist_libsane_st400_la_SOURCES = st400-s.c ../sanei/sanei_scsi.lo
libsane_st400_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=st400
libsane_st400_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_st400_la_LIBADD = $(COMMON_LIBS) libst400.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_scsi.lo $(SCSI_LIBS) $(RESMGR_LIBS)
@@ -1050,7 +1050,7 @@ EXTRA_DIST += umax-scanner.c umax-scanner.h umax-scsidef.h umax-uc1200s.c umax-u
libumax1220u_la_SOURCES = umax1220u.c
libumax1220u_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=umax1220u
nodist_libsane_umax1220u_la_SOURCES = umax1220u-s.c
nodist_libsane_umax1220u_la_SOURCES = umax1220u-s.c
libsane_umax1220u_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=umax1220u
libsane_umax1220u_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_umax1220u_la_LIBADD = $(COMMON_LIBS) libumax1220u.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_pv8630.lo $(MATH_LIB) $(USB_LIBS) $(RESMGR_LIBS)
@@ -1101,14 +1101,14 @@ EXTRA_DIST += dll.conf.in
EXTRA_DIST += dll.aliases
# libsane.la and libsane-dll.la are the same thing except for
# the addition of backends listed by PRELOADABLE_BACKENDS that are
# the addition of backends listed by PRELOADABLE_BACKENDS that are
# statically linked in.
# Also, libsane.la goes into $(libdir) where as all libsane-*
# (including libsane-dll.la) go into $(libdir)/sane
# FIXME: Since we are throwing in the kitchen sink, might as
# well link in ../sanei/libsanei.la instead. But currently,
# libsanei.la is linking in sanei_auth which requires md5.
# libsanei.la is linking in sanei_auth which requires md5.
# Shipping md5 could cause symbol conflicts with commonly used
# md5 external libraries. Either need to prefix md5 with sanei_
# (see liblib.la and snprintf), or move sanei_auth outside
backend/abaton.c
+21 -21
View File
@@ -322,7 +322,7 @@ set_window (Abaton_Scanner * s)
uint8_t cmd[10 + 40];
uint8_t *window = cmd + 10 + 8;
int invert;
memset (cmd, 0, sizeof (cmd));
cmd[0] = SET_WINDOW;
cmd[8] = 40;
@@ -379,11 +379,11 @@ set_window (Abaton_Scanner * s)
s->val[OPT_HALFTONE_PATTERN].s);
return SANE_STATUS_INVAL;
}
/* We have to invert these ones for some reason, so why not
let the scanner do it for us... */
STORE8 (window + 21, invert ? 0x80 : 0);
STORE16 (window + 22, (s->val[OPT_MIRROR].w != 0));
return sanei_scsi_cmd (s->fd, cmd, sizeof (cmd), 0, 0);
@@ -511,7 +511,7 @@ calc_parameters (Abaton_Scanner * s)
SANE_Int dpix = s->val[OPT_X_RESOLUTION].w;
SANE_Int dpiy = s->val[OPT_Y_RESOLUTION].w;
double ulx, uly, width, height;
DBG (FLOW_CONTROL, "Entering calc_parameters\n");
if (!strcmp (val, SANE_VALUE_SCAN_MODE_LINEART) || !strcmp (val, SANE_VALUE_SCAN_MODE_HALFTONE))
@@ -549,7 +549,7 @@ calc_parameters (Abaton_Scanner * s)
s->ULy = uly * dpiy;
s->Width = width * dpix;
s->Height = height * dpiy;
DBG (VARIABLE_CONTROL, "(pixels) ulx: %d, uly: %d, width: %d, height: %d\n",
s->ULx, s->ULy, s->Width, s->Height);
@@ -653,7 +653,7 @@ init_options (Abaton_Scanner * s)
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
s->val[OPT_NUM_OPTS].w = NUM_OPTIONS;
/* "Mode" group: */
s->opt[OPT_MODE_GROUP].title = "Scan Mode";
s->opt[OPT_MODE_GROUP].desc = "";
@@ -662,7 +662,7 @@ init_options (Abaton_Scanner * s)
s->opt[OPT_MODE_GROUP].constraint_type = SANE_CONSTRAINT_NONE;
mode_list[0]=SANE_VALUE_SCAN_MODE_LINEART;
switch (s->hw->ScannerModel)
{
case ABATON_300GS:
@@ -676,7 +676,7 @@ init_options (Abaton_Scanner * s)
mode_list[1]=NULL;
break;
}
/* scan mode */
s->opt[OPT_MODE].name = SANE_NAME_SCAN_MODE;
s->opt[OPT_MODE].title = SANE_TITLE_SCAN_MODE;
@@ -724,7 +724,7 @@ init_options (Abaton_Scanner * s)
s->opt[OPT_PREVIEW].cap = SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT;
s->opt[OPT_PREVIEW].type = SANE_TYPE_BOOL;
s->val[OPT_PREVIEW].w = SANE_FALSE;
/* halftone pattern */
s->opt[OPT_HALFTONE_PATTERN].name = SANE_NAME_HALFTONE_PATTERN;
s->opt[OPT_HALFTONE_PATTERN].title = SANE_TITLE_HALFTONE_PATTERN;
@@ -832,7 +832,7 @@ init_options (Abaton_Scanner * s)
s->opt[OPT_NEGATIVE].unit = SANE_UNIT_NONE;
s->opt[OPT_NEGATIVE].constraint_type = SANE_CONSTRAINT_NONE;
s->val[OPT_NEGATIVE].w = SANE_FALSE;
/* mirror-image */
s->opt[OPT_MIRROR].name = "mirror";
s->opt[OPT_MIRROR].title = "Mirror Image";
@@ -974,7 +974,7 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
/* set up some universal parameters */
s->params.last_frame = SANE_TRUE;
s->params.format = SANE_FRAME_GRAY;
/* insert newly opened handle into list of open handles: */
s->next = first_handle;
first_handle = s;
@@ -1017,7 +1017,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
if ((unsigned) option >= NUM_OPTIONS)
return NULL;
return s->opt + option;
}
@@ -1072,7 +1072,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
case OPT_HALFTONE_PATTERN:
status = sanei_constrain_value (s->opt + option, s->val[option].s,
info);
strcpy (val, s->val[option].s);
strcpy (val, s->val[option].s);
return SANE_STATUS_GOOD;
}
}
@@ -1103,7 +1103,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
if (info)
*info |= SANE_INFO_RELOAD_PARAMS;
return SANE_STATUS_GOOD;
case OPT_RESOLUTION_BIND:
s->val[option].w = *(SANE_Word *) val;
if (*(SANE_Word *) val) {
@@ -1114,7 +1114,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
SANE_INFO_RELOAD_OPTIONS;
}
return SANE_STATUS_GOOD;
case OPT_X_RESOLUTION:
if (s->val[OPT_PREVIEW].w || s->val[OPT_RESOLUTION_BIND].w) {
s->val[OPT_Y_RESOLUTION].w = *(SANE_Word *)val;
@@ -1155,7 +1155,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
calc_parameters (s);
if (info)
*info |= SANE_INFO_RELOAD_PARAMS
| SANE_INFO_INEXACT;
| SANE_INFO_INEXACT;
return SANE_STATUS_GOOD;
/* no side-effects whatsoever */
@@ -1176,7 +1176,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
free (s->val[option].s);
s->val[option].s = strdup (val);
return SANE_STATUS_GOOD;
case OPT_MODE:
status = mode_update (s, val);
if (status != SANE_STATUS_GOOD)
@@ -1295,7 +1295,7 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
/* this is a sub-optimal way of doing this, I'm sure */
if (!s->scanning)
return SANE_STATUS_EOF;
if (!strcmp (s->val[OPT_MODE].s, "Gray16"))
Pseudo8bit = SANE_TRUE;
@@ -1352,13 +1352,13 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
{
rread = data_av;
}
DBG (IO_MESSAGE,
"sane_read: (action) Actual read request for %u bytes.\n",
rread);
size = rread;
STORE24 (read + 6, rread);
status = sanei_scsi_cmd (s->fd, read, sizeof (read),
@@ -1487,7 +1487,7 @@ sane_get_select_fd (SANE_Handle handle, SANE_Int * fd)
{
handle = handle; /* silence gcc */
fd = fd; /* silence gcc */
DBG (FLOW_CONTROL, "sane_get_select_fd: Don't call me please. "
"Unimplemented function\n");
return SANE_STATUS_UNSUPPORTED;
backend/abaton.h
+4 -4
View File
@@ -54,7 +54,7 @@ enum Abaton_Modes
ABATON_MODE_HALFTONE,
ABATON_MODE_GRAY
};
enum Abaton_Option
{
OPT_NUM_OPTS = 0,
@@ -66,7 +66,7 @@ enum Abaton_Option
OPT_RESOLUTION_BIND,
OPT_PREVIEW,
OPT_HALFTONE_PATTERN,
OPT_GEOMETRY_GROUP,
OPT_TL_X, /* top-left x */
OPT_TL_Y, /* top-left y */
@@ -79,7 +79,7 @@ enum Abaton_Option
OPT_THRESHOLD,
OPT_NEGATIVE,
OPT_MIRROR,
/* must come last: */
NUM_OPTIONS
};
@@ -110,7 +110,7 @@ typedef struct Abaton_Scanner
SANE_Bool scanning;
SANE_Bool AbortedByUser;
SANE_Parameters params;
/* The actual bpp, before "Pseudo-8-bit" fiddling */
backend/agfafocus.c
+56 -56
View File
@@ -116,11 +116,11 @@ max_string_size (const SANE_String_Const strings[])
}
/* sets loc_s bytes long value at offset loc in scsi command to value size */
static void
static void
set_size (Byte * loc, int loc_s, size_t size)
{
int i;
for (i = 0; i < loc_s; i++)
{
loc[loc_s - i - 1] = (size >> (i * 8)) & 0xff;
@@ -142,10 +142,10 @@ get_size (Byte * loc, int loc_s)
return j;
}
static long
static long
reserve_unit (int fd)
{
struct
struct
{
/* Command */
Byte cmd;
@@ -164,10 +164,10 @@ reserve_unit (int fd)
return sanei_scsi_cmd (fd, &scsi_reserve, sizeof (scsi_reserve), 0, 0);
}
static long
static long
release_unit (int fd)
{
struct
struct
{
/* Command */
Byte cmd;
@@ -192,7 +192,7 @@ test_ready (int fd)
SANE_Status status;
int try;
struct
struct
{
/* Command */
Byte cmd;
@@ -317,7 +317,7 @@ wait_ready (int fd)
Byte tr_len[3];
Byte ctrl;
} cmd;
memset (&cmd, 0, sizeof (cmd));
cmd.cmd = 0x28; /* READ */
@@ -468,7 +468,7 @@ set_window (AgfaFocus_Scanner * s)
Byte tonecurve; /* Tone curve (0 - 8) */
Byte ht_pattern; /* Halftone pattern */
Byte paddingtype; /* Padding type */
Byte bitordering[2]; /* Bit ordering (0 = left to right) */
Byte comprtype; /* Compression type */
Byte comprarg; /* Compression argument */
@@ -522,7 +522,7 @@ set_window (AgfaFocus_Scanner * s)
set_size (cmd.tr_len, 3, 36 + 8);
set_size (cmd.wd_len, 2, 36);
break;
case AGFACOLOR:
set_size (cmd.tr_len, 3, 65 + 8);
set_size (cmd.wd_len, 2, 65);
@@ -582,7 +582,7 @@ set_window (AgfaFocus_Scanner * s)
cmd.wd.ht_pattern = s->halftone;
else
cmd.wd.ht_pattern = 3;
cmd.wd.intensity = brightness;
cmd.wd.contrast = contrast;
@@ -645,20 +645,20 @@ upload_dither_matrix (AgfaFocus_Scanner * s, int rows, int cols, int *dither_mat
Byte re1[3];
Byte tr_len[3];
Byte ctrl;
struct {
Byte nrrows[2];
Byte nrcols[2];
struct {
Byte data[2];
} element[256];
} wd;
} cmd;
SANE_Status status;
int i;
memset (&cmd, 0, sizeof (cmd));
cmd.cmd = 0x2a; /* WRITE */
@@ -670,9 +670,9 @@ upload_dither_matrix (AgfaFocus_Scanner * s, int rows, int cols, int *dither_mat
for (i = 0; i < cols * rows; ++i)
set_size (cmd.wd.element[i].data, 2, dither_matrix[i]);
status = sanei_scsi_cmd (s->fd, &cmd, sizeof (cmd), 0, 0);
if (status != SANE_STATUS_GOOD)
/* Command failed */
return SANE_STATUS_IO_ERROR;
@@ -692,7 +692,7 @@ upload_tonecurve (AgfaFocus_Scanner * s, int color_type, int input, int output,
Byte re1[4];
Byte tr_len[3];
Byte ctrl;
Byte re2[6];
Byte wd_len[2];
@@ -700,7 +700,7 @@ upload_tonecurve (AgfaFocus_Scanner * s, int color_type, int input, int output,
Byte color_type[2];
Byte nrinput[2];
Byte nroutput[2];
struct {
Byte data[2];
} outputval[256];
@@ -721,9 +721,9 @@ upload_tonecurve (AgfaFocus_Scanner * s, int color_type, int input, int output,
for (i = 0; i < cols; ++i)
for (j = 0; j < rows; ++j)
set_size (cmd.wd.element[j + i * rows].data, 2, dither_matrix[j + i * rows]);
status = sanei_scsi_cmd (s->fd, &cmd, sizeof (cmd), 0, 0);
if (status != SANE_STATUS_GOOD)
/* * Command failed * */
return SANE_STATUS_IO_ERROR;
@@ -760,22 +760,22 @@ read_data (AgfaFocus_Scanner * s, SANE_Byte *buf, int lines, int bpl)
set_size (cmd.tr_len, 3, lines);
size = lines * bpl;
status = sanei_scsi_cmd (s->fd, &cmd, sizeof (cmd), buf, &size);
if (status != SANE_STATUS_GOOD)
{
DBG (1, "sanei_scsi_cmd() = %d\n", status);
return SANE_STATUS_IO_ERROR;
}
if (size != ((unsigned int) lines * bpl))
{
DBG (1, "sanei_scsi_cmd(): got %lu bytes, expected %d\n",
(u_long) size, lines * bpl);
return SANE_STATUS_INVAL;
}
DBG (1, "Got %lu bytes\n", (u_long) size);
/* Reverse: */
@@ -788,7 +788,7 @@ read_data (AgfaFocus_Scanner * s, SANE_Byte *buf, int lines, int bpl)
for (i = 0; i < size; i++)
buf[i] = 255 - ((buf[i] * 256.0f) / 64.0f);
}
s->lines_available -= lines;
return SANE_STATUS_GOOD;
@@ -1182,7 +1182,7 @@ init_options (AgfaFocus_Scanner * s)
s->opt[OPT_CONTRAST].constraint_type = SANE_CONSTRAINT_RANGE;
s->opt[OPT_CONTRAST].constraint.range = &percentage_range;
s->val[OPT_CONTRAST].w = 0;
/* halftone patterns */
s->opt[OPT_HALFTONE_PATTERN].name = SANE_NAME_HALFTONE_PATTERN;
s->opt[OPT_HALFTONE_PATTERN].title = SANE_TITLE_HALFTONE_PATTERN;
@@ -1324,7 +1324,7 @@ sane_exit (void)
sane_close (dev->handle);
free (dev);
}
if (devlist)
free (devlist);
}
@@ -1510,16 +1510,16 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
s->val[option].s = strdup (val);
if (strcmp (s->val[option].s, "Gray (6 bit)") == 0)
s->mode = GRAY6BIT;
s->mode = GRAY6BIT;
else if (strcmp (s->val[option].s, "Gray (8 bit)") == 0)
s->mode = GRAY8BIT;
s->mode = GRAY8BIT;
else if (strcmp (s->val[option].s, "Color (18 bit)") == 0)
s->mode = COLOR18BIT;
s->mode = COLOR18BIT;
else if (strcmp (s->val[option].s, "Color (24 bit)") == 0)
s->mode = COLOR24BIT;
s->mode = COLOR24BIT;
else
s->mode = LINEART;
switch (s->mode)
{
case LINEART:
@@ -1679,18 +1679,18 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
case LINEART:
{
const char *halftone;
s->image_composition = 0;
/* in 1 bpp mode, lines need to be 8 pixel length */
if (s->params.pixels_per_line % 8)
s->params.pixels_per_line += 8 - (s->params.pixels_per_line % 8);
s->params.format = SANE_FRAME_GRAY;
s->params.bytes_per_line = s->params.pixels_per_line / 8;
s->bpp = s->params.depth = 1;
halftone = s->val[OPT_HALFTONE_PATTERN].s;
if (strcmp (halftone, "1") == 0 )
s->halftone = 1;
@@ -1704,14 +1704,14 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
s->halftone = 5;
else
s->halftone = 0;
s->edge = s->val[OPT_SHARPEN].w;
}
break;
case GRAY6BIT:
s->image_composition = 2;
s->params.format = SANE_FRAME_GRAY;
s->params.bytes_per_line = s->params.pixels_per_line;
s->bpp = 6;
@@ -1722,7 +1722,7 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
case GRAY8BIT:
s->image_composition = 2;
s->params.format = SANE_FRAME_GRAY;
s->params.bytes_per_line = s->params.pixels_per_line;
s->bpp = s->params.depth = 8;
@@ -1760,9 +1760,9 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
if (s->mode == COLOR18BIT ||
s->mode == COLOR24BIT)
s->params.format = SANE_FRAME_RED + s->pass;
s->params.last_frame = (s->params.format != SANE_FRAME_RED && s->params.format != SANE_FRAME_GREEN);
if (params)
*params = s->params;
return SANE_STATUS_GOOD;
@@ -1856,23 +1856,23 @@ reader_process (void *scanner)
{
/* No lines in scanner? Scan some more */
status = request_more_data (s);
if (status != SANE_STATUS_GOOD)
{
close (fd);
return 1;
}
}
/* We only request as many lines as there are already scanned */
if (lines > s->lines_available)
lines = s->lines_available;
DBG (1, "Requesting %d lines, in scanner: %d, total: %d\n", lines,
s->lines_available, s->params.lines);
status = read_data (s, data, lines, bytes_per_line);
if (status != SANE_STATUS_GOOD)
{
DBG (1, "sane_read: read_data() failed (%s)\n",
@@ -1881,10 +1881,10 @@ reader_process (void *scanner)
close (fd);
return 1;
}
/* Sometimes the scanner will return more bytes per line than
requested, so we copy only what we wanted. */
for (i = 0; i < lines; i++)
if (write (fd, data + i * bytes_per_line, s->params.bytes_per_line) != s->params.bytes_per_line)
{
@@ -1895,7 +1895,7 @@ reader_process (void *scanner)
lines_read += lines;
}
close (fd);
return 0;
}
@@ -1906,14 +1906,14 @@ sane_start (SANE_Handle handle)
AgfaFocus_Scanner *s = handle;
SANE_Status status;
int fds[2];
/* First make sure we have a current parameter set. Some of the
parameters will be overwritten below, but that's OK. */
status = sane_get_parameters (s, 0);
if (status != SANE_STATUS_GOOD)
return status;
/* don't initialise scanner if we're doing a three-pass scan */
if (s->pass == 0)
@@ -1966,10 +1966,10 @@ sane_start (SANE_Handle handle)
42, 26, 38, 22, 43, 27, 39, 23,
4, 58, 14, 54, 1, 59, 15, 55,
36, 20, 46, 30, 33, 17, 47, 31,
12, 52, 8, 62, 9, 49, 5, 63,
12, 52, 8, 62, 9, 49, 5, 63,
44, 28, 40, 24, 41, 25, 37, 21
};
status = upload_dither_matrix (s, 8, 8, matrix);
if (status != SANE_STATUS_GOOD)
{
@@ -2030,7 +2030,7 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
if (!s->scanning)
return do_cancel (s);
if (nread < 0) {
if (errno == EAGAIN) {
return SANE_STATUS_GOOD;
backend/agfafocus.h
+1 -1
View File
@@ -27,7 +27,7 @@ enum AgfaFocus_Scanner_Type
AGFAGRAY64,
AGFALINEART,
AGFAGRAY256,
AGFACOLOR
AGFACOLOR
};
typedef enum
backend/apple.c
+13 -13
View File
@@ -227,14 +227,14 @@ static const uint8_t test_unit_ready[] =
#if 0
SANE_Int
SANE_Int
xqstep (unsigned int Xres, unsigned int bpp)
{
return (SANE_Int) ((double) (8 * 1200)) / ((double) (Xres * bpp));
}
SANE_Int
SANE_Int
yqstep (unsigned int Yres, unsigned int bpp)
{
return (SANE_Int) ((double) (1200)) / ((double) (Yres));
@@ -246,7 +246,7 @@ yqstep (unsigned int Yres, unsigned int bpp)
/* The functions below return the quantized value of x,y in scanners dots
aka 1/1200 of an inch */
static SANE_Int
static SANE_Int
xquant (double x, unsigned int Xres, unsigned int bpp, int dir)
{
double tmp;
@@ -264,7 +264,7 @@ xquant (double x, unsigned int Xres, unsigned int bpp, int dir)
static SANE_Int
static SANE_Int
yquant (double y, unsigned int Yres, int dir)
{
double tmp;
@@ -986,7 +986,7 @@ calc_parameters (Apple_Scanner * s)
s->ulx, s->uly, s->wx, s->wy);
/*
/*
TODO: Remove this ugly hack (Protect). Read to learn why!
@@ -1168,7 +1168,7 @@ mode_update (SANE_Handle handle, char *val)
DISABLE (OPT_HALFTONE_PATTERN);
if (s->hw->ScannerModel == COLORONESCANNER)
ENABLE(OPT_COLOR_SENSOR);
} /* End of Gray */
else if (!strcmp (val, "BiColor"))
{
@@ -1215,7 +1215,7 @@ mode_update (SANE_Handle handle, char *val)
{
DISABLE (OPT_THRESHOLD);
DISABLE (OPT_AUTOBACKGROUND_THRESHOLD);
if (s->hw->ScannerModel == COLORONESCANNER)
{
ENABLE (OPT_VOLT_REF);
@@ -1302,7 +1302,7 @@ init_options (Apple_Scanner * s)
s->opt[OPT_HWDETECT_GROUP].type = SANE_TYPE_GROUP;
s->opt[OPT_HWDETECT_GROUP].cap = 0;
s->opt[OPT_HWDETECT_GROUP].constraint_type = SANE_CONSTRAINT_NONE;
s->opt[OPT_MODEL].name = "model";
s->opt[OPT_MODEL].title = "Model";
s->opt[OPT_MODEL].desc = "Model and capabilities";
@@ -1325,7 +1325,7 @@ init_options (Apple_Scanner * s)
halftone_pattern_list[1]="bayer4x4";
halftone_pattern_list[2]="download";
halftone_pattern_list[3]=NULL;
switch (s->hw->ScannerModel)
{
@@ -1515,7 +1515,7 @@ init_options (Apple_Scanner * s)
s->opt[OPT_AUTOBACKGROUND_THRESHOLD].constraint.range = &byte_range;
s->val[OPT_AUTOBACKGROUND_THRESHOLD].w = 64;
/* AppleScanner & OneScanner options */
/* Select HalfTone Pattern */
@@ -2440,7 +2440,7 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
#ifdef RESERVE_RELEASE_HACK
uint8_t reserve[6];
uint8_t release[6];
#endif
#endif
uint8_t result[12];
size_t size;
@@ -2457,7 +2457,7 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
#else
*len = 0;
if (!s->scanning) return SANE_STATUS_EOF;
if (!strcmp (s->val[OPT_MODE].s, "Gray16"))
Pseudo8bit = SANE_TRUE;
@@ -2493,7 +2493,7 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
release[1]|=SETTHIRDPARTY;
#endif
do
{
size = sizeof (result);
backend/apple.h
+4 -4
View File
@@ -91,7 +91,7 @@ enum Apple_Modes
EMPTY_DONT_USE_IT,
APPLE_MODE_COLOR
};
enum Apple_Option
{
OPT_NUM_OPTS = 0,
@@ -116,7 +116,7 @@ enum Apple_Option
OPT_BRIGHTNESS,
OPT_CONTRAST,
OPT_THRESHOLD,
/* AppleScanner only */
OPT_GRAYMAP,
OPT_AUTOBACKGROUND,
@@ -147,7 +147,7 @@ enum Apple_Option
/* OneScanner && ColorOneScanner */
OPT_LED,
OPT_CCD,
/* ColorOneScanner only */
OPT_MTF_CIRCUIT,
@@ -255,7 +255,7 @@ TODO: Initialize this beasts with malloc instead of statically allocation.
SANE_Bool scanning;
SANE_Bool AbortedByUser;
int pass; /* pass number */
SANE_Parameters params;
backend/artec.c
+1 -1
View File
@@ -1715,7 +1715,7 @@ artec_get_cap_data (ARTEC_Device * dev, int fd)
DBG (7, "artec_get_cap_data()\n");
/* DB always use the hard-coded capability info first
/* DB always use the hard-coded capability info first
* if we get cap data from the scanner, we override */
cap_model = -1;
for (loop = 0; loop < NELEMS (cap_data); loop++)
backend/avision.c
+1042 -1042
View File
File diff suppressed because it is too large Load Diff
backend/avision.h
+65 -65
View File
@@ -1,7 +1,7 @@
/*******************************************************************************
* SANE - Scanner Access Now Easy.
avision.h
avision.h
This file is part of the SANE package.
@@ -41,7 +41,7 @@
This backend is based upon the Tamarack backend and adapted to the Avision
scanners by René Rebe and Meino Cramer.
Check the avision.c file for detailed copyright and change-log
information.
@@ -78,7 +78,7 @@ typedef struct Avision_Connection {
AVISION_USB_INT_STATUS, /* interrupt endp. (USB 1.x device) status */
AVISION_USB_BULK_STATUS /* bulk endp. (USB 2.0 device) status */
} usb_status;
} Avision_Connection;
typedef struct Avision_HWEntry {
@@ -90,33 +90,33 @@ typedef struct Avision_HWEntry {
const char* real_mfg;
const char* real_model;
/* feature overwrites - as embedded CPUs have 16bit enums - this
would need a change ... */
/* force no calibration */
#define AV_NO_CALIB ((uint64_t)1<<0)
/* force all in one command calibration */
#define AV_ONE_CALIB_CMD ((uint64_t)1<<1)
/* no gamma table */
#define AV_NO_GAMMA ((uint64_t)1<<2)
/* light check is bogus */
#define AV_LIGHT_CHECK_BOGUS ((uint64_t)1<<3)
/* no button though the device advertise it */
#define AV_NO_BUTTON ((uint64_t)1<<4)
/* if the scan area needs to be forced to A3 */
#define AV_FORCE_A3 ((uint64_t)1<<5)
/* if the scan area and resolution needs to be forced for films */
#define AV_FORCE_FILM ((uint64_t)1<<6)
/* does not suport, or very broken background (added for AV610C2) */
#define AV_NO_BACKGROUND ((uint64_t)1<<7)
/* is film scanner - no detection yet */
#define AV_FILMSCANNER ((uint64_t)1<<8)
@@ -125,7 +125,7 @@ typedef struct Avision_HWEntry {
/* gray calibration data has to be uploaded on the blue channel ... ? */
#define AV_GRAY_CALIB_BLUE ((uint64_t)1<<10)
/* Interrupt endpoint button readout (so far AV220) */
#define AV_INT_BUTTON ((uint64_t)1<<11)
@@ -161,35 +161,35 @@ typedef struct Avision_HWEntry {
/* very broken background raster */
#define AV_BACKGROUND_QUIRK ((uint64_t)1<<22)
/* though marked as GRAY only the scanner can do GRAY modes */
#define AV_GRAY_MODES ((uint64_t)1<<23)
/* no seperate, single REAR scan (AV122, DM152, ...) */
#define AV_NO_REAR ((uint64_t)1<<24)
/* only scan with some known good hardware resolutions, as the
scanner fails to properly interpoloate in between (e.g. AV121,
DM152 on duplex scans - but also the AV600), software scale and
interpolate to all the others */
#define AV_SOFT_SCALE ((uint64_t)1<<25)
/* does keep window though it does not advertice it - the AV122/DM152
mess up image data if window is resend between ADF pages */
#define AV_DOES_KEEP_WINDOW ((uint64_t)1<<26)
/* does keep gamma though it does not advertice it */
#define AV_DOES_KEEP_GAMMA ((uint64_t)1<<27)
/* does the scanner contain a Cancel button? */
#define AV_CANCEL_BUTTON ((uint64_t)1<<28)
/* is the rear image offset? */
#define AV_REAR_OFFSET ((uint64_t)1<<29)
/* some devices do not need a START_SCAN, even hang with it */
#define AV_NO_START_SCAN ((uint64_t)1<<30)
#define AV_INT_STATUS ((uint64_t)1<<31)
/* force no calibration */
@@ -203,7 +203,7 @@ typedef struct Avision_HWEntry {
/* For scanners which need to have their firmware read to properly function. */
#define AV_FIRMWARE ((uint64_t)1<<35)
/* maybe more ...*/
uint64_t feature_type;
@@ -252,32 +252,32 @@ typedef enum {
enum Avision_Option
{
OPT_NUM_OPTS = 0, /* must come first */
OPT_MODE_GROUP,
OPT_MODE,
OPT_RESOLUTION,
#define OPT_RESOLUTION_DEFAULT 150
OPT_SPEED,
OPT_PREVIEW,
OPT_SOURCE, /* scan source normal, transparency, ADF */
OPT_GEOMETRY_GROUP,
OPT_TL_X, /* top-left x */
OPT_TL_Y, /* top-left y */
OPT_BR_X, /* bottom-right x */
OPT_BR_Y, /* bottom-right y */
OPT_OVERSCAN_TOP, /* overscan for auto-crop/deskew, if supported */
OPT_OVERSCAN_BOTTOM,
OPT_BACKGROUND, /* background raster lines to read out */
OPT_ENHANCEMENT_GROUP,
OPT_BRIGHTNESS,
OPT_CONTRAST,
OPT_QSCAN,
OPT_QCALIB,
OPT_GAMMA_VECTOR, /* first must be gray */
OPT_GAMMA_VECTOR_R, /* then r g b vector */
OPT_GAMMA_VECTOR_G,
@@ -286,15 +286,15 @@ enum Avision_Option
OPT_EXPOSURE, /* film exposure adjustment */
OPT_IR, /* infra-red */
OPT_MULTISAMPLE, /* multi-sample */
OPT_MISC_GROUP,
OPT_FRAME, /* Film holder control */
OPT_POWER_SAVE_TIME, /* set power save time to the scanner */
OPT_MESSAGE, /* optional message from the scanner display */
OPT_MESSAGE, /* optional message from the scanner display */
OPT_NVRAM, /* retrieve NVRAM values as pretty printed text */
OPT_PAPERLEN, /* Use paper_length field to detect double feeds */
OPT_ADF_FLIP, /* For flipping duplex, reflip the document */
@@ -306,28 +306,28 @@ typedef struct Avision_Dimensions
/* in dpi */
int xres;
int yres;
/* in pixels */
long tlx;
long tly;
long brx;
long bry;
/* in pixels */
int line_difference;
int rear_offset; /* in pixels of HW res */
/* interlaced duplex scan */
SANE_Bool interlaced_duplex;
/* in dpi, likewise - different if software scaling required */
int hw_xres;
int hw_yres;
int hw_pixels_per_line;
int hw_bytes_per_line;
int hw_lines;
} Avision_Dimensions;
/* this contains our low-level info - not relevant for the SANE interface */
@@ -336,7 +336,7 @@ typedef struct Avision_Device
struct Avision_Device* next;
SANE_Device sane;
Avision_Connection connection;
/* structs used to store config options */
SANE_Range dpi_range;
SANE_Range x_range;
@@ -369,34 +369,34 @@ typedef struct Avision_Device
SANE_Bool inquiry_light_detect;
SANE_Bool inquiry_light_control;
SANE_Bool inquiry_exposure_control;
int inquiry_max_shading_target;
SANE_Bool inquiry_button_control;
unsigned int inquiry_buttons;
SANE_Bool inquiry_tune_scan_length;
SANE_Bool inquiry_background_raster;
int inquiry_background_raster_pixel;
enum {AV_FLATBED,
AV_FILM,
AV_SHEETFEED
} scanner_type;
/* the list of available color modes */
SANE_String_Const color_list[AV_COLOR_MODE_LAST + 1];
color_mode color_list_num[AV_COLOR_MODE_LAST];
color_mode color_list_default;
/* the list of available source modes */
SANE_String_Const source_list[AV_SOURCE_MODE_LAST + 1];
source_mode source_list_num[AV_SOURCE_MODE_LAST];
int inquiry_optical_res; /* in dpi */
int inquiry_max_res; /* in dpi */
double inquiry_x_ranges [AV_SOURCE_MODE_DIM_LAST]; /* in mm */
double inquiry_y_ranges [AV_SOURCE_MODE_DIM_LAST]; /* in mm */
int inquiry_color_boundary;
int inquiry_gray_boundary;
int inquiry_dithered_boundary;
@@ -406,7 +406,7 @@ typedef struct Avision_Device
int inquiry_channels_per_pixel;
int inquiry_bits_per_channel;
int inquiry_no_gray_modes;
int scsi_buffer_size; /* nice to have SCSI buffer size */
int read_stripe_size; /* stripes to be read at-a-time */
@@ -414,10 +414,10 @@ typedef struct Avision_Device
SANE_Range frame_range;
SANE_Word current_frame;
SANE_Word holder_type;
/* some versin corrections */
uint16_t data_dq; /* was ox0A0D - but hangs some new scanners */
Avision_HWEntry* hw;
} Avision_Device;
@@ -426,19 +426,19 @@ typedef struct Avision_Scanner
{
struct Avision_Scanner* next;
Avision_Device* hw;
SANE_Option_Descriptor opt [NUM_OPTIONS];
Option_Value val [NUM_OPTIONS];
SANE_Int gamma_table [4][256];
/* we now save the calib data because we might need it for 16bit software
calibration :-( */
uint8_t* dark_avg_data;
uint8_t* white_avg_data;
/* background raster data, if duplex first front, then rear */
uint8_t* background_raster;
/* Parsed option values and variables that are valid only during
the actual scan: */
SANE_Bool prepared; /* first page marker */
@@ -448,22 +448,22 @@ typedef struct Avision_Scanner
SANE_Parameters params; /* scan window */
Avision_Dimensions avdimen; /* scan window - detailed internals */
/* Internal data for duplex scans */
char duplex_rear_fname [PATH_MAX];
SANE_Bool duplex_rear_valid;
color_mode c_mode;
source_mode source_mode;
source_mode_dim source_mode_dim;
/* Avision HW Access Connection (SCSI/USB abstraction) */
Avision_Connection av_con;
SANE_Pid reader_pid; /* process id of reader */
int read_fds; /* pipe reading end */
int write_fds; /* pipe writing end */
} Avision_Scanner;
/* Some Avision driver internal defines */
@@ -549,7 +549,7 @@ typedef struct command_send
uint8_t opc;
uint8_t bitset1;
uint8_t datatypecode;
uint8_t reserved0;
uint8_t reserved0;
uint8_t datatypequal [2];
uint8_t transferlen [3];
uint8_t reserved1;
@@ -602,7 +602,7 @@ typedef struct nvram_data
uint8_t jam_count [4];
uint8_t reserved;
char identify_info[16];
char identify_info[16];
char formal_name[16];
uint8_t reserved2 [10];
@@ -614,7 +614,7 @@ typedef struct command_set_window_window
uint8_t reserved0 [6];
uint8_t desclen [2];
} header;
struct {
uint8_t winid;
uint8_t reserved0;
@@ -641,37 +641,37 @@ typedef struct command_set_window_window
uint8_t vendor_specific;
uint8_t paralen; /* bytes following after this byte */
} descriptor;
struct {
uint8_t bitset1;
uint8_t highlight;
uint8_t shadow;
uint8_t line_width [2];
uint8_t line_count [2];
/* the tail is quite version and model specific */
union {
struct {
uint8_t bitset2;
uint8_t reserved;
} old;
struct {
uint8_t bitset2;
uint8_t ir_exposure_time;
/* optional */
uint8_t r_exposure_time [2];
uint8_t g_exposure_time [2];
uint8_t b_exposure_time [2];
uint8_t bitset3; /* reserved in the v2 */
uint8_t auto_focus;
uint8_t line_width_msb;
uint8_t line_count_msb;
uint8_t background_lines;
} normal;
struct {
uint8_t reserved0 [4];
uint8_t paper_size;
@@ -716,7 +716,7 @@ typedef struct calibration_format
uint16_t r_dark_shading_target;
uint16_t g_dark_shading_target;
uint16_t b_dark_shading_target;
/* not returned but usefull in some places */
uint8_t channels;
} calibration_format;
@@ -726,7 +726,7 @@ typedef struct matrix_3x3
uint16_t v[9];
} matrix_3x3;
typedef struct acceleration_info
typedef struct acceleration_info
{
uint16_t total_steps;
uint16_t stable_steps;
backend/bh.c
+166 -166
View File
File diff suppressed because it is too large Load Diff
backend/bh.h
+25 -25
View File
@@ -73,16 +73,16 @@
#define BH_SECTION_FRONT_PATCH (1 << 4)
#define BH_SECTION_BACK_PATCH (1 << 5)
typedef enum
{
BH_UNIT_INCH,
BH_UNIT_MM,
typedef enum
{
BH_UNIT_INCH,
BH_UNIT_MM,
BH_UNIT_POINT
} bh_measureUnit;
typedef enum
{
BH_COMP_NONE,
BH_COMP_NONE,
BH_COMP_G31D,
BH_COMP_G32D,
BH_COMP_G42D
@@ -90,13 +90,13 @@ typedef enum
typedef enum
{
BH_ROTATION_0,
BH_ROTATION_0,
BH_ROTATION_90,
BH_ROTATION_180,
BH_ROTATION_270
} bh_rotation;
typedef enum
typedef enum
{
OPT_NUM_OPTS = 0,
@@ -171,30 +171,30 @@ typedef enum
OPT_BARCODE_SEARCH_BAR,
/* Barcode search count (1-7, default 3). */
OPT_BARCODE_SEARCH_COUNT,
/* Barcode search mode.
* (1 = horizontal,2 = vertical, 6 = v then h, 9 = h then v).
/* Barcode search mode.
* (1 = horizontal,2 = vertical, 6 = v then h, 9 = h then v).
*/
OPT_BARCODE_SEARCH_MODE,
/* Patch code min height (def=127 (5mm)) */
OPT_BARCODE_HMIN,
/* Barcode search timeout in ms
* (20-65535,default is disabled).
OPT_BARCODE_HMIN,
/* Barcode search timeout in ms
* (20-65535,default is disabled).
*/
OPT_BARCODE_SEARCH_TIMEOUT,
/* Specify image sections and functions
*/
OPT_SECTION,
/* Specifies the maximum relation from the widest to
* the smallest bar
/* Specifies the maximum relation from the widest to
* the smallest bar
*/
OPT_BARCODE_RELMAX,
/* Specifies the minimum number of bars in Bar/Patch code */
OPT_BARCODE_BARMIN,
/* Specifies the maximum number of bars in a Bar/Patch code */
OPT_BARCODE_BARMAX,
/* Specifies the image contrast used in decoding.
* Use higher values when there are more white pixels
* in the code
/* Specifies the image contrast used in decoding.
* Use higher values when there are more white pixels
* in the code
*/
OPT_BARCODE_CONTRAST,
/* Controls Patch Code detection. */
@@ -291,8 +291,8 @@ typedef struct _BH_Info
SANE_Int resMaxY; /* maximum Y resolution */
SANE_Int resMinX; /* minimum X resolution */
SANE_Int resMinY; /* minimum Y resolution */
SANE_Int resStdList[16+1]; /* list of available standard resolutions
* (first slot is the length)
SANE_Int resStdList[16+1]; /* list of available standard resolutions
* (first slot is the length)
*/
SANE_Int winWidth; /* length of window (in BasicX res DPI) */
SANE_Int winHeight; /* height of window (in BasicY res DPI) */
@@ -321,7 +321,7 @@ struct _BH_Scanner
/* SCSI filedescriptor */
int fd;
/* tempfile which is used to send decoded barcode data */
FILE *barf;
char barfname[PATH_MAX+1];
@@ -337,7 +337,7 @@ struct _BH_Scanner
/* SANE image parameters */
SANE_Parameters params;
/* state information - not options */
/* Basic Measurement Unit */
@@ -394,9 +394,9 @@ static const SANE_Range barcode_search_timeout_range =
static const SANE_Range barcode_hmin_range =
{
1, /* minimum */
1660, /* maximum (when converted from mm
* to thousandths will still be less
* than 65536)
1660, /* maximum (when converted from mm
* to thousandths will still be less
* than 65536)
*/
0 /* quantization */
};
@@ -915,7 +915,7 @@ struct mode_page_03 {
SANE_Byte mediumtype;
SANE_Byte devicespecificparam;
SANE_Byte blockdescriptorlen;
SANE_Byte pagecode;
SANE_Byte paramlen;
SANE_Byte bmu;
backend/canon-sane.c
+1 -1
View File
@@ -1126,7 +1126,7 @@ sane_start (SANE_Handle handle)
if (thistmpfile != NULL)
{
if (mktemp(thistmpfile) == 0)
{
{
DBG(1, "mktemp(thistmpfile) is failed\n");
return (SANE_STATUS_INVAL);
}
backend/canon-scsi.c
+1 -1
View File
@@ -623,7 +623,7 @@ wait_ready(int fd)
while ((status = test_unit_ready (fd)) != SANE_STATUS_GOOD)
{
DBG(5, "wait_ready failed (%d)\n", retry);
if (retry++ > 15)
if (retry++ > 15)
return SANE_STATUS_IO_ERROR;
sleep(3);
}
backend/canon.c
+2 -2
View File
@@ -62,7 +62,7 @@
. . - sane_get_parameters() : returns actual scan-parameters
. . - sane_read() : read image-data (from pipe)
. . - sane_cancel() : cancel operation, kill reader_process
. - sane_close() : close opened scanner-device, do_cancel, free buffer and handle
- sane_exit() : terminate use of backend, free devicename and device-struture
*/
@@ -140,7 +140,7 @@ static const SANE_String_Const mode_list[] = {
SANE_VALUE_SCAN_MODE_HALFTONE,
SANE_VALUE_SCAN_MODE_GRAY,
SANE_VALUE_SCAN_MODE_COLOR,
0
0
};
/* modification for FS2710 */
backend/canon630u-common.c
+21 -21
View File
@@ -35,15 +35,15 @@
If you write modifications of your own for SANE, it is your choice
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice.
If you do not wish that, delete this exception notice.
*/
/*
Communication, calibration, and scanning with the Canon CanoScan FB630U
flatbed scanner under linux.
Reworked into SANE-compatible format.
The usb-parallel port interface chip is GL640usb, on the far side of
which is an LM9830 parallel-port scanner-on-a-chip.
@@ -153,7 +153,7 @@ gl640ReadReq (int fd, GL640_Request req, byte * data)
}
/* Write USB bulk data
/* Write USB bulk data
setup is an apparently scanner-specific sequence:
{(0=read, 1=write), 0x00, 0x00, 0x00, sizelo, sizehi, 0x00, 0x00}
hp3400: setup[1] = 0x01
@@ -177,7 +177,7 @@ gl640WriteBulk (int fd, byte * setup, byte * data, size_t size)
}
/* Read USB bulk data
/* Read USB bulk data
setup is an apparently scanner-specific sequence:
{(0=read, 1=write), 0x00, 0x00, 0x00, sizelo, sizehi, 0x00, 0x00}
fb630u: setup[2] = 0x80
@@ -461,7 +461,7 @@ typedef struct CANON_Handle
#define FLG_GRAY 0x01 /* grayscale */
#define FLG_FORCE_CAL 0x02 /* force calibration */
#define FLG_BUF 0x04 /* save scan to buffer instead of file */
#define FLG_NO_INTERLEAVE 0x08 /* don't interleave r,g,b pixels; leave them
#define FLG_NO_INTERLEAVE 0x08 /* don't interleave r,g,b pixels; leave them
in row format */
#define FLG_PPM_HEADER 0x10 /* include PPM header in scan file */
}
@@ -501,7 +501,7 @@ init (int fd)
{
byte result, rv;
if (gl640WriteReq (fd, GL640_GPIO_OE, 0x71) != SANE_STATUS_GOOD) {
if (gl640WriteReq (fd, GL640_GPIO_OE, 0x71) != SANE_STATUS_GOOD) {
DBG(1, "Initial write request failed.\n");
return -1;
}
@@ -653,7 +653,7 @@ do_scan (CANON_Handle * s)
fwrite (redptr + s->width, 1, 1, fp); /* Green */
fwrite (redptr + s->width + s->width, 1, 1, fp); /* Blue */
/* for PPM ascii (P3)
fprintf(fp, "%3d %3d %3d\n", *redptr,
fprintf(fp, "%3d %3d %3d\n", *redptr,
*(redptr + s->width),
*(redptr + s->width + s->width));
*/
@@ -869,8 +869,8 @@ plugin_cal (CANON_Handle * s)
write_word (fd, LAMP_B_OFF, 0x0100);
/* coming in, we've got 300dpi,
data px start : 0x004b
data px end : 0x1437 for a total of 5100(13ec) 600-dpi pixels,
(8.5 inches) or 2550 300-dpi pixels (7653 bytes).
data px end : 0x1437 for a total of 5100(13ec) 600-dpi pixels,
(8.5 inches) or 2550 300-dpi pixels (7653 bytes).
Interestingly, the scan head never moves, no matter how many rows
are read. */
s->width = 2551;
@@ -981,7 +981,7 @@ plugin_cal (CANON_Handle * s)
somewhat more complicated than necessary because I don't hard-code the
strip widths; I try to figure out the regions based on the scan data.
Theoretically, the region-finder should work for any number of distinct
regions (but there are only 2 on this scanner.)
regions (but there are only 2 on this scanner.)
This produces the CAL_FILE_OGN file, the final offset/gain table. */
static SANE_Status
compute_ogn (char *calfilename)
@@ -1132,7 +1132,7 @@ compute_ogn (char *calfilename)
continue;
}
/* Gain multiplier:
/* Gain multiplier:
255 : 1.5 times brighter
511 : 2 times brighter
1023: 3 times brighter */
@@ -1146,9 +1146,9 @@ compute_ogn (char *calfilename)
offset would be bad. */
/* Enhanced offset and gain calculation by M.Reinelt <reinelt@eunet.at>
* These expressions were found by an iterative calibration process,
* These expressions were found by an iterative calibration process,
* by changing gain and offset values for every pixel until the desired
* values for black and white were reached, and finding an approximation
* values for black and white were reached, and finding an approximation
* formula.
* Note that offset is linear, but gain isn't!
*/
@@ -1256,8 +1256,8 @@ scan (CANON_Handle * opt)
read_byte (fd, STATUS, &result); /* wants 2f or 2d */
if (!(result & STATUS_HOME) /*0x2d */ )
return SANE_STATUS_DEVICE_BUSY;
/* or force it to return?
write_byte(fd, COMMAND, 0x02);
/* or force it to return?
write_byte(fd, COMMAND, 0x02);
wait_for_return(fd);
*/
@@ -1439,9 +1439,9 @@ CANON_set_scan_parameters (CANON_Handle * scan,
const int left,
const int top,
const int right,
const int bottom,
const int res,
const int gain,
const int bottom,
const int res,
const int gain,
const double gamma)
{
DBG (2, "CANON_set_scan_parameters:\n");
@@ -1593,12 +1593,12 @@ CANON_start_scan (CANON_Handle * scanner)
return SANE_STATUS_IO_ERROR;
}
if ((rv == 1)
|| !check_ogn_file ()
|| !check_ogn_file ()
|| (scanner->flags & FLG_FORCE_CAL)) {
plugin_cal (scanner);
wait_for_return (scanner->fd);
}
/* scan */
if ((status = scan (scanner)) != SANE_STATUS_GOOD)
{
backend/canon630u.c
+2 -2
View File
@@ -703,7 +703,7 @@ attach_one (const char *name)
}
/*
/*
Find our devices
*/
SANE_Status
@@ -995,7 +995,7 @@ sane_start (SANE_Handle handle)
MM_IN_INCH * 600,
SANE_UNFIX (optionBotRightYValue) /
MM_IN_INCH * 600,
optionResolutionValue,
optionResolutionValue,
optionAGainValue,
SANE_UNFIX (optionGammaValue));
backend/canon_dr-cmd.h
+2 -2
View File
@@ -1,7 +1,7 @@
#ifndef CANON_DR_CMD_H
#define CANON_DR_CMD_H
/*
/*
* Part of SANE - Scanner Access Now Easy.
* Please see opening comments in canon_dr.c
*/
@@ -571,7 +571,7 @@ putnbyte (unsigned char *pnt, unsigned int value, unsigned int nbytes)
/* FIXME: more params here? */
#define set_WD_reserved2(sb, val) sb[0x2a] = val
#define get_WD_reserved2(sb) sb[0x2a]
/* ==================================================================== */
backend/canon_dr.c
+241 -241
View File
File diff suppressed because it is too large Load Diff
backend/canon_dr.conf.in
+1 -1
View File
@@ -1,6 +1,6 @@
#######################################################################
# NOTE: 'option' lines only apply to the devices found by
# the NEXT 'usb' or 'scsi' line. You may repeat the option line if
# the NEXT 'usb' or 'scsi' line. You may repeat the option line if
# required for multiple scanners of different models/connections.
#######################################################################
backend/canon_dr.h
+6 -6
View File
@@ -1,12 +1,12 @@
#ifndef CANON_DR_H
#define CANON_DR_H
/*
/*
* Part of SANE - Scanner Access Now Easy.
* Please see opening comments in canon_dr.c
*/
/* -------------------------------------------------------------------------
/* -------------------------------------------------------------------------
* This option list has to contain all options for all scanners supported by
* this driver. If a certain scanner cannot handle a certain option, there's
* still the possibility to say so, later.
@@ -89,7 +89,7 @@ struct img_params
int Bpl; /* in bytes */
int valid_width; /*some machines have black padding*/
int valid_Bpl;
int valid_Bpl;
/* done yet? */
int eof[2];
@@ -183,7 +183,7 @@ struct scanner
int has_df;
int has_df_ultra;
int has_btc;
int has_ssm; /* older scanners use this set scan mode command */
int has_ssm; /* older scanners use this set scan mode command */
int has_ssm2; /* newer scanners user this similar command */
int has_ssm_pay_head_len; /* newer scanners put the length twice in ssm */
int can_read_sensors;
@@ -454,8 +454,8 @@ enum {
#define DUPLEX_INTERLACE_2510 3
#define DUPLEX_INTERLACE_fFBb 4
#define JPEG_INTERLACE_ALT 0
#define JPEG_INTERLACE_NONE 1
#define JPEG_INTERLACE_ALT 0
#define JPEG_INTERLACE_NONE 1
#define CROP_RELATIVE 0
#define CROP_ABSOLUTE 1
backend/canon_pp-dev.c
+151 -151
View File
@@ -40,12 +40,12 @@
-----
This file is part of the canon_pp backend, supporting Canon CanoScan
Parallel scanners and also distributed as part of the stand-alone driver.
This file is part of the canon_pp backend, supporting Canon CanoScan
Parallel scanners and also distributed as part of the stand-alone driver.
canon_pp-dev.c: $Revision$
Misc constants for Canon CanoScan Parallel scanners and high-level scan
Misc constants for Canon CanoScan Parallel scanners and high-level scan
functions.
Simon Krix <kinsei@users.sourceforge.net>
@@ -105,7 +105,7 @@ struct scanner_hardware_desc {
unsigned int type;
};
static const struct scanner_hardware_desc
static const struct scanner_hardware_desc
/* The known scanner types */
hw_fb320p = { "FB320P", 2, 2, 3508, 2552, 0 },
hw_fb330p = { "FB330P", 2, 2, 3508, 0, 1 },
@@ -124,7 +124,7 @@ struct scanner_id {
char *id;
const struct scanner_hardware_desc *hw;
};
static const struct scanner_id scanner_id_table[] = {
static const struct scanner_id scanner_id_table[] = {
{ "CANON IX-03055C", &hw_fb320p },
{ "CANON IX-06025C", &hw_fb620p },
{ "CANON IX-03075E", &hw_fb330p },
@@ -139,15 +139,15 @@ static const int fileversion = 3;
/* Internal functions */
static unsigned long column_sum(image_segment *image, int x);
static int adjust_output(image_segment *image, scan_parameters *scanp,
static int adjust_output(image_segment *image, scan_parameters *scanp,
scanner_parameters *scannerp);
static int check8(unsigned char *p, int s);
/* Converts from weird scanner format -> sequential data */
static void convdata(unsigned char *srcbuffer, unsigned char *dstbuffer,
static void convdata(unsigned char *srcbuffer, unsigned char *dstbuffer,
int width, int mode);
/* Sets up the scan command. This could use a better name
(and a rewrite). */
static int scanner_setup_params(unsigned char *buf, scanner_parameters *sp,
static int scanner_setup_params(unsigned char *buf, scanner_parameters *sp,
scan_parameters *scanp);
/* file reading and writing helpers */
@@ -155,7 +155,7 @@ static int safe_write(int fd, const char *p, unsigned long len);
static int safe_read(int fd, char *p, unsigned long len);
/* Command sending loop (waiting for ready status) */
static int send_command(struct parport *port, unsigned char *buf, int bufsize,
static int send_command(struct parport *port, unsigned char *buf, int bufsize,
int delay, int timeout);
/* Commands ================================================ */
@@ -219,8 +219,8 @@ static unsigned char command_14[32] =
0, 0, 0, 0,
0x12, 0xd1, 0x14, 0x82,
0, 0, 0, 0,
0x0f, 0xff,
0x0f, 0xff,
0x0f, 0xff,
0x0f, 0xff,
0x0f, 0xff, 0, 0 };
#endif
@@ -229,15 +229,15 @@ static unsigned char command_14[32] =
/*
* safe_write(): a small wrapper which ensures all the data is written in calls
* to write(), since the POSIX call doesn't ensure it.
* to write(), since the POSIX call doesn't ensure it.
*/
static int safe_write(int fd, const char *p, unsigned long len) {
int diff;
int diff;
unsigned long total = 0;
do {
diff = write(fd, p+total, len-total);
if (diff < 0)
if (diff < 0)
{
if (errno == EINTR) continue;
return -1;
@@ -249,7 +249,7 @@ static int safe_write(int fd, const char *p, unsigned long len) {
}
/* same dealie for read, except in the case of read the return of 0 bytes with
/* same dealie for read, except in the case of read the return of 0 bytes with
* no INTR error indicates EOF */
static int safe_read(int fd, char *p, unsigned long len) {
int diff;
@@ -257,7 +257,7 @@ static int safe_read(int fd, char *p, unsigned long len) {
do {
diff = read(fd, p+total, len-total);
if (diff <= 0)
if (diff <= 0)
{
if (errno == EINTR) continue;
if (diff == 0) return -2;
@@ -282,7 +282,7 @@ int sanei_canon_pp_init_scan(scanner_parameters *sp, scan_parameters *scanp)
/* Buffer for buffer info block */
unsigned char buffer_info_block[6];
/* The image size the scanner says we asked for
/* The image size the scanner says we asked for
(based on the scanner's replies) */
int true_scanline_size, true_scanline_count;
@@ -301,7 +301,7 @@ int sanei_canon_pp_init_scan(scanner_parameters *sp, scan_parameters *scanp)
if (send_command(sp->port, command_b, 56, 50000, 1000000))
return -1;
/* Ask the scanner about the buffer */
if (send_command(sp->port, cmd_buf_status, 10, 50000, 1000000))
return -1;
@@ -309,7 +309,7 @@ int sanei_canon_pp_init_scan(scanner_parameters *sp, scan_parameters *scanp)
/* Read buffer information block */
sanei_canon_pp_read(sp->port, 6, buffer_info_block);
if (check8(buffer_info_block, 6))
if (check8(buffer_info_block, 6))
DBG(1, "init_scan: ** Warning: Checksum error reading buffer "
"info block.\n");
@@ -321,7 +321,7 @@ int sanei_canon_pp_init_scan(scanner_parameters *sp, scan_parameters *scanp)
expected_scanline_size = scanp->width * 1.25; break;
case 1: /* true-colour; 30 bits per pixel */
expected_scanline_size = scanp->width * 3.75; break;
default:
default:
DBG(1, "init_scan: Illegal mode %i requested in "
"init_scan().\n", scanp->mode);
DBG(1, "This is a bug. Please report it.\n");
@@ -329,29 +329,29 @@ int sanei_canon_pp_init_scan(scanner_parameters *sp, scan_parameters *scanp)
}
/* The scanner's idea of the length of each scanline in bytes */
true_scanline_size = (buffer_info_block[0]<<8) | buffer_info_block[1];
true_scanline_size = (buffer_info_block[0]<<8) | buffer_info_block[1];
/* The scanner's idea of the number of scanlines in total */
true_scanline_count = (buffer_info_block[2]<<8) | buffer_info_block[3];
true_scanline_count = (buffer_info_block[2]<<8) | buffer_info_block[3];
if ((expected_scanline_size != true_scanline_size)
if ((expected_scanline_size != true_scanline_size)
|| (expected_scanline_count != true_scanline_count))
{
DBG(10, "init_scan: Warning: Scanner is producing an image "
"of unexpected size:\n");
DBG(10, "expected: %i bytes wide, %i scanlines tall.\n",
expected_scanline_size,
DBG(10, "expected: %i bytes wide, %i scanlines tall.\n",
expected_scanline_size,
expected_scanline_count);
DBG(10, "true: %i bytes wide, %i scanlines tall.\n",
DBG(10, "true: %i bytes wide, %i scanlines tall.\n",
true_scanline_size, true_scanline_count);
if (scanp->mode == 0)
scanp->width = true_scanline_size / 1.25;
else
scanp->width = true_scanline_size / 3.75;
scanp->width = true_scanline_size / 3.75;
scanp->height = true_scanline_count;
}
return 0;
return 0;
}
@@ -373,7 +373,7 @@ int sanei_canon_pp_initialise(scanner_parameters *sp, int mode)
DBG(50, "initialise: >> scanner_init\n");
if (sanei_canon_pp_scanner_init(sp->port))
{
/* If we're using an unsupported ieee1284 mode here, this is
/* If we're using an unsupported ieee1284 mode here, this is
* where it will fail, so fall back to nibble. */
sanei_canon_pp_set_ieee1284_mode(M1284_NIBBLE);
if (sanei_canon_pp_scanner_init(sp->port))
@@ -416,12 +416,12 @@ int sanei_canon_pp_initialise(scanner_parameters *sp, int mode)
{
hw = cur_id->hw;
}
else if (sp->scanheadwidth == 5104)
else if (sp->scanheadwidth == 5104)
{
/* Guess 600dpi scanner */
hw = &hw_alien600;
}
else if (sp->scanheadwidth == 2552)
else if (sp->scanheadwidth == 2552)
{
/* Guess 300dpi scanner */
hw = &hw_alien300;
@@ -433,24 +433,24 @@ int sanei_canon_pp_initialise(scanner_parameters *sp, int mode)
}
strcpy(sp->name, hw->name);
sp->natural_xresolution = hw->natural_xresolution;
sp->natural_yresolution = hw->natural_yresolution;
sp->natural_xresolution = hw->natural_xresolution;
sp->natural_yresolution = hw->natural_yresolution;
sp->scanbedlength = hw->scanbedlength;
if (hw->scanheadwidth)
sp->scanheadwidth = hw->scanheadwidth;
sp->type = hw->type;
return 0;
return 0;
}
/* Shut scanner down */
int sanei_canon_pp_close_scanner(scanner_parameters *sp)
{
/* Put scanner in transparent mode */
/* Put scanner in transparent mode */
sanei_canon_pp_sleep_scanner(sp->port);
/* Free memory (with purchase of memory of equal or greater value) */
if (sp->blackweight != NULL)
if (sp->blackweight != NULL)
{
free(sp->blackweight);
sp->blackweight = NULL;
@@ -471,7 +471,7 @@ int sanei_canon_pp_close_scanner(scanner_parameters *sp)
sp->blueweight = NULL;
}
return 0;
return 0;
}
/* Read the calibration information from file */
@@ -497,7 +497,7 @@ int sanei_canon_pp_load_weights(const char *filename, scanner_parameters *sp)
return -2;
}
/* Read and check file version (the calibrate file
/* Read and check file version (the calibrate file
format changes from time to time) */
ret = safe_read(fd, (char *)&temp, sizeof(int));
@@ -512,7 +512,7 @@ int sanei_canon_pp_load_weights(const char *filename, scanner_parameters *sp)
if (((sp->blueweight = malloc(cal_data_size)) == NULL)
|| ((sp->redweight = malloc(cal_data_size)) == NULL)
|| ((sp->greenweight = malloc(cal_data_size)) == NULL)
|| ((sp->blackweight = malloc(cal_data_size)) == NULL))
|| ((sp->blackweight = malloc(cal_data_size)) == NULL))
return -4;
/* Read width of calibration data */
@@ -555,20 +555,20 @@ int sanei_canon_pp_load_weights(const char *filename, scanner_parameters *sp)
}
/* Read white-balance/gamma data */
if (safe_read(fd, (char *)&(sp->gamma), 32) < 0)
{
close(fd);
return -10;
}
close(fd);
close(fd);
return 0;
}
/* Mode is 0 for greyscale source data or 1 for RGB */
static void convert_to_rgb(image_segment *dest, unsigned char *src,
static void convert_to_rgb(image_segment *dest, unsigned char *src,
int width, int scanlines, int mode)
{
int curline;
@@ -581,23 +581,23 @@ static void convert_to_rgb(image_segment *dest, unsigned char *src,
if (mode == 0) /* Grey */
{
convdata(src + (curline * scanline_size),
dest->image_data +
convdata(src + (curline * scanline_size),
dest->image_data +
(curline * width * 2), width, 1);
}
else if (mode == 1) /* Truecolour */
{
/* Red */
convdata(src + (curline * scanline_size),
dest->image_data +
convdata(src + (curline * scanline_size),
dest->image_data +
(curline * width *3*2) + 4, width, 2);
/* Green */
convdata(src + (curline * scanline_size) + colour_size,
dest->image_data +
convdata(src + (curline * scanline_size) + colour_size,
dest->image_data +
(curline * width *3*2) + 2, width, 2);
/* Blue */
convdata(src + (curline * scanline_size) +
(2 * colour_size), dest->image_data +
convdata(src + (curline * scanline_size) +
(2 * colour_size), dest->image_data +
(curline * width *3*2), width, 2);
}
@@ -605,7 +605,7 @@ static void convert_to_rgb(image_segment *dest, unsigned char *src,
}
int sanei_canon_pp_read_segment(image_segment **dest, scanner_parameters *sp,
int sanei_canon_pp_read_segment(image_segment **dest, scanner_parameters *sp,
scan_parameters *scanp, int scanline_number, int do_adjust,
int scanlines_left)
{
@@ -646,8 +646,8 @@ int sanei_canon_pp_read_segment(image_segment **dest, scanner_parameters *sp,
/* Allocate memory for dest image segment */
output_image->image_data =
malloc(output_image->width * output_image->height *
output_image->image_data =
malloc(output_image->width * output_image->height *
(scanp->mode ? 3 : 1) * 2);
if (output_image->image_data == NULL)
@@ -679,17 +679,17 @@ int sanei_canon_pp_read_segment(image_segment **dest, scanner_parameters *sp,
if ((packet_header[2]<<8) + packet_header[3] != read_data_size)
{
DBG(1, "read_segment: Error: Expected data size: %i bytes.\n",
DBG(1, "read_segment: Error: Expected data size: %i bytes.\n",
read_data_size);
DBG(1, "read_segment: Expecting %i bytes times %i "
"scanlines.\n", scanline_size, scanline_number);
DBG(1, "read_segment: Actual data size: %i bytes.\n",
DBG(1, "read_segment: Actual data size: %i bytes.\n",
(packet_header[2] << 8) + packet_header[3]);
goto error_out;
}
/* Read scanlines_this_packet scanlines into the input buf */
if (sanei_canon_pp_read(sp->port, read_data_size, input_buffer))
{
DBG(1, "read_segment: Segment read incorrectly, and we don't "
@@ -697,11 +697,11 @@ int sanei_canon_pp_read_segment(image_segment **dest, scanner_parameters *sp,
goto error_out;
}
/* This is the only place we can abort safely -
/* This is the only place we can abort safely -
* between reading one segment and requesting the next one. */
if (sp->abort_now) goto error_out;
if (scanlines_left >= (scanline_number * 2))
if (scanlines_left >= (scanline_number * 2))
{
DBG(100, "read_segment: Speculatively starting more scanning "
"(%d left)\n", scanlines_left);
@@ -711,7 +711,7 @@ int sanei_canon_pp_read_segment(image_segment **dest, scanner_parameters *sp,
DBG(100, "read_segment: Convert to RGB\n");
/* Convert data */
convert_to_rgb(output_image, input_buffer, scanp->width,
convert_to_rgb(output_image, input_buffer, scanp->width,
scanline_number, scanp->mode);
/* Adjust pixel readings according to calibration data */
@@ -724,10 +724,10 @@ int sanei_canon_pp_read_segment(image_segment **dest, scanner_parameters *sp,
*dest = output_image;
/* finished with this now */
free(input_buffer);
return 0;
return 0;
error_out:
if (output_image && output_image->image_data)
if (output_image && output_image->image_data)
free(output_image->image_data);
if (output_image) free(output_image);
if (input_buffer) free(input_buffer);
@@ -735,13 +735,13 @@ int sanei_canon_pp_read_segment(image_segment **dest, scanner_parameters *sp,
return -1;
}
/*
/*
check8: Calculates the checksum-8 for s bytes pointed to by p.
For messages from the scanner, this should normally end up returning
0, since the last byte of most packets is the value that makes the
0, since the last byte of most packets is the value that makes the
total up to 0 (or 256 if you're left-handed).
Hence, usage: if (check8(buffer, size)) {DBG(10, "checksum error!\n");}
Hence, usage: if (check8(buffer, size)) {DBG(10, "checksum error!\n");}
Can also be used to generate valid checksums for sending to the scanner.
*/
@@ -756,13 +756,13 @@ static int check8(unsigned char *p, int s) {
/* Converts from scanner format -> linear
width is in pixels, not bytes. */
/* This function could use a rewrite */
static void convdata(unsigned char *srcbuffer, unsigned char *dstbuffer,
static void convdata(unsigned char *srcbuffer, unsigned char *dstbuffer,
int width, int mode)
/* This is a tricky (read: crap) function (read: hack) which is why I probably
spent more time commenting it than programming it. The thing to remember
/* This is a tricky (read: crap) function (read: hack) which is why I probably
spent more time commenting it than programming it. The thing to remember
here is that the scanner uses interpolated scanlines, so it's
RRRRRRRGGGGGGBBBBBB not RGBRGBRGBRGBRGB. So, the calling function just
increments the destination pointer slightly to handle green, then a bit
RRRRRRRGGGGGGBBBBBB not RGBRGBRGBRGBRGB. So, the calling function just
increments the destination pointer slightly to handle green, then a bit
more for blue. If you don't understand, tough. */
{
int count;
@@ -770,13 +770,13 @@ static void convdata(unsigned char *srcbuffer, unsigned char *dstbuffer,
for (count = 0; count < width; count++)
{
/* The scanner stores data in a bizzare butchered 10-bit
/* The scanner stores data in a bizzare butchered 10-bit
format. I'll try to explain it in 100 words or less:
Scanlines are made up of groups of 4 pixels. Each group of
4 is stored inside 5 bytes. The first 4 bytes of the group
contain the lowest 8 bits of one pixel each (in the right
order). The 5th byte contains the most significant 2 bits
Scanlines are made up of groups of 4 pixels. Each group of
4 is stored inside 5 bytes. The first 4 bytes of the group
contain the lowest 8 bits of one pixel each (in the right
order). The 5th byte contains the most significant 2 bits
of each pixel in the same order. */
i = srcbuffer[count + (count >> 2)]; /* Low byte for pixel */
@@ -784,7 +784,7 @@ static void convdata(unsigned char *srcbuffer, unsigned char *dstbuffer,
j = j >> ((count % 4) * 2); /* Get upper 2 bits of intensity */
j = j & 0x03; /* Can't hurt */
/* And the final 10-bit pixel value is: */
k = (j << 8) | i;
k = (j << 8) | i;
/* now we return this as a 16 bit value */
k = k << 6;
@@ -797,17 +797,17 @@ static void convdata(unsigned char *srcbuffer, unsigned char *dstbuffer,
else if (mode == 2) /* Scanner -> RGB */
{
dstbuffer[count * 3 * 2] = HIGH_BYTE(k);
dstbuffer[(count * 3 * 2) + 1] = LOW_BYTE(k);
dstbuffer[(count * 3 * 2) + 1] = LOW_BYTE(k);
}
}
}
static int adjust_output(image_segment *image, scan_parameters *scanp,
static int adjust_output(image_segment *image, scan_parameters *scanp,
scanner_parameters *scannerp)
/* Needing a good cleanup */
{
/* light and dark points for the CCD sensor in question
/* light and dark points for the CCD sensor in question
* (stored in file as 0-1024, scaled to 0-65536) */
unsigned long hi, lo;
/* The result of our calculations */
@@ -827,70 +827,70 @@ static int adjust_output(image_segment *image, scan_parameters *scanp,
{
/* Figure out CCD sensor number */
/* MAGIC FORMULA ALERT! */
ccd = (pixelnum << (scannerp->natural_xresolution -
scanp->xresolution)) + (1 <<
(scannerp->natural_xresolution
ccd = (pixelnum << (scannerp->natural_xresolution -
scanp->xresolution)) + (1 <<
(scannerp->natural_xresolution
- scanp->xresolution)) - 1;
scaled_xoff = scanp->xoffset <<
(scannerp->natural_xresolution -
scaled_xoff = scanp->xoffset <<
(scannerp->natural_xresolution -
scanp->xresolution);
ccd += scaled_xoff;
ccd += scaled_xoff;
for (colour = 0; colour < cols; colour++)
{
/* Address of pixel under scrutiny */
pixel_address =
pixel_address =
(scanline * image->width * cols * 2) +
(pixelnum * cols * 2) + (colour * 2);
/* Dark value is easy
/* Dark value is easy
* Range of lo is 0-18k */
lo = (scannerp->blackweight[ccd]) * 3;
/* Light value depends on the colour,
/* Light value depends on the colour,
* and is an average in greyscale mode. */
if (scanp->mode == 1) /* RGB */
{
switch (colour)
{
case 0: hi = scannerp->redweight[ccd] * 3;
case 0: hi = scannerp->redweight[ccd] * 3;
break;
case 1: hi = scannerp->greenweight[ccd] * 3;
case 1: hi = scannerp->greenweight[ccd] * 3;
break;
default: hi = scannerp->blueweight[ccd] * 3;
default: hi = scannerp->blueweight[ccd] * 3;
break;
}
}
else /* Grey - scanned using green */
{
hi = scannerp->greenweight[ccd] * 3;
hi = scannerp->greenweight[ccd] * 3;
}
/* Check for bad calibration data as it
/* Check for bad calibration data as it
can cause a divide-by-0 error */
if (hi <= lo)
{
DBG(1, "adjust_output: Bad cal data!"
" hi: %ld lo: %ld\n"
"Recalibrate, that "
"should fix it.\n",
"should fix it.\n",
hi, lo);
return -1;
}
/* Start with the pixel value in result */
result = MAKE_SHORT(*(image->image_data +
pixel_address),
*(image->image_data +
result = MAKE_SHORT(*(image->image_data +
pixel_address),
*(image->image_data +
pixel_address + 1));
result = result >> 6; /* Range now = 0-1023 */
/*
if (scanline == 10)
DBG(200, "adjust_output: Initial pixel"
" value: %ld\n",
" value: %ld\n",
result);
*/
result *= 54; /* Range now = 0-54k */
@@ -913,13 +913,13 @@ static int adjust_output(image_segment *image, scan_parameters *scanp,
{
DBG(200, "adjust_output: %d: base = "
"%lu, result %lu (%lu "
"- %lu)\n", pixelnum,
"- %lu)\n", pixelnum,
result, temp, lo, hi);
}
}
*/
result = temp;
/* Store the value back where it came
/* Store the value back where it came
* from (always bigendian) */
*(image->image_data + pixel_address)
= HIGH_BYTE(result);
@@ -934,7 +934,7 @@ static int adjust_output(image_segment *image, scan_parameters *scanp,
/* Calibration run. Aborting allowed at "safe" points where the scanner won't
* be left in a crap state. */
int sanei_canon_pp_calibrate(scanner_parameters *sp, char *cal_file)
int sanei_canon_pp_calibrate(scanner_parameters *sp, char *cal_file)
{
int count, readnum, colournum, scanlinenum;
int outfile;
@@ -962,11 +962,11 @@ int sanei_canon_pp_calibrate(scanner_parameters *sp, char *cal_file)
if (sp->abort_now) return -1;
DBG(40, "Calibrating %ix%i pixels calibration image "
"(%i bytes each scan).\n",
sp->scanheadwidth, scanline_count,
"(%i bytes each scan).\n",
sp->scanheadwidth, scanline_count,
scanline_size * scanline_count);
/* Allocate memory for calibration data */
/* Allocate memory for calibration data */
sp->blackweight = (unsigned long *)
calloc(sizeof(unsigned long), sp->scanheadwidth);
sp->redweight = (unsigned long *)
@@ -981,7 +981,7 @@ int sanei_canon_pp_calibrate(scanner_parameters *sp, char *cal_file)
databuf = malloc(scanline_size * scanline_count * calibration_reads*3);
/* And allocate space for converted image data in this image_segment */
image.image_data = malloc(scanline_count * sp->scanheadwidth * 2 *
image.image_data = malloc(scanline_count * sp->scanheadwidth * 2 *
calibration_reads);
image.width = sp->scanheadwidth;
image.height = scanline_count * calibration_reads;
@@ -996,7 +996,7 @@ int sanei_canon_pp_calibrate(scanner_parameters *sp, char *cal_file)
DBG(40, "Step 1/3: Calibrating black level...\n");
for (readnum = 0; readnum < calibration_reads; readnum++)
{
DBG(40, " * Black scan number %d/%d.\n", readnum + 1,
DBG(40, " * Black scan number %d/%d.\n", readnum + 1,
calibration_reads);
if (sp->abort_now) return -1;
@@ -1007,32 +1007,32 @@ int sanei_canon_pp_calibrate(scanner_parameters *sp, char *cal_file)
free (image.image_data);
free(databuf);
return -1;
}
/* Black reference data */
sanei_canon_pp_read(sp->port, scanline_size * scanline_count,
databuf +
databuf +
(readnum * scanline_size * scanline_count));
}
/* Convert scanner format to a greyscale 16bpp image */
for (scanlinenum = 0;
scanlinenum < scanline_count * calibration_reads;
for (scanlinenum = 0;
scanlinenum < scanline_count * calibration_reads;
scanlinenum++)
{
convdata(databuf + (scanlinenum * scanline_size),
image.image_data +
(scanlinenum * sp->scanheadwidth*2),
convdata(databuf + (scanlinenum * scanline_size),
image.image_data +
(scanlinenum * sp->scanheadwidth*2),
sp->scanheadwidth, 1);
}
/* Take column totals */
for (count = 0; count < sp->scanheadwidth; count++)
{
/* Value is normalised as if we took 6 scanlines, even if we
/* Value is normalised as if we took 6 scanlines, even if we
* didn't (620P I'm looking at you!) */
sp->blackweight[count] = (column_sum(&image, count) * 6)
sp->blackweight[count] = (column_sum(&image, count) * 6)
/ scanline_count >> 6;
}
@@ -1057,7 +1057,7 @@ int sanei_canon_pp_calibrate(scanner_parameters *sp, char *cal_file)
DBG(20, " * Snoozing for 15 seconds while the scanner calibrates...");
usleep(15000000);
DBG(40, "done.\n");
DBG(40, " * Requesting gamma table values...");
if (send_command(sp->port, cmd_readgamma, 10, 100000, 10000000))
{
@@ -1088,7 +1088,7 @@ int sanei_canon_pp_calibrate(scanner_parameters *sp, char *cal_file)
command_buffer[3] = colournum;
for (readnum = 0; readnum < 3; readnum++)
{
DBG(10, " * %s sensors, scan number %d/%d.\n",
DBG(10, " * %s sensors, scan number %d/%d.\n",
colours[colournum-1], readnum + 1,
calibration_reads);
@@ -1102,20 +1102,20 @@ int sanei_canon_pp_calibrate(scanner_parameters *sp, char *cal_file)
return -1;
}
sanei_canon_pp_read(sp->port, scanline_size *
scanline_count, databuf +
(readnum * scanline_size *
sanei_canon_pp_read(sp->port, scanline_size *
scanline_count, databuf +
(readnum * scanline_size *
scanline_count));
}
/* Convert colour data from scanner format to RGB data */
for (scanlinenum = 0; scanlinenum < scanline_count *
for (scanlinenum = 0; scanlinenum < scanline_count *
calibration_reads; scanlinenum++)
{
convdata(databuf + (scanlinenum * scanline_size),
image.image_data +
(scanlinenum * sp->scanheadwidth * 2),
convdata(databuf + (scanlinenum * scanline_size),
image.image_data +
(scanlinenum * sp->scanheadwidth * 2),
sp->scanheadwidth, 1);
}
@@ -1123,14 +1123,14 @@ int sanei_canon_pp_calibrate(scanner_parameters *sp, char *cal_file)
for (count = 0; count < sp->scanheadwidth; count++)
{
if (colournum == 1)
sp->redweight[count] =
column_sum(&image, count) >> 6;
sp->redweight[count] =
column_sum(&image, count) >> 6;
else if (colournum == 2)
sp->greenweight[count] =
column_sum(&image, count) >> 6;
sp->greenweight[count] =
column_sum(&image, count) >> 6;
else
sp->blueweight[count] =
column_sum(&image, count) >> 6;
sp->blueweight[count] =
column_sum(&image, count) >> 6;
}
}
@@ -1154,19 +1154,19 @@ int sanei_canon_pp_calibrate(scanner_parameters *sp, char *cal_file)
DBG(10, "Write error on calibration file %s", cal_file);
/* Data */
if (safe_write(outfile, (char *)&(sp->scanheadwidth),
if (safe_write(outfile, (char *)&(sp->scanheadwidth),
sizeof(sp->scanheadwidth)) < 0)
DBG(10, "Write error on calibration file %s", cal_file);
if (safe_write(outfile, (char *)(sp->blackweight),
if (safe_write(outfile, (char *)(sp->blackweight),
sp->scanheadwidth * sizeof(long)) < 0)
DBG(10, "Write error on calibration file %s", cal_file);
if (safe_write(outfile, (char *)(sp->redweight),
if (safe_write(outfile, (char *)(sp->redweight),
sp->scanheadwidth * sizeof(long)) < 0)
DBG(10, "Write error on calibration file %s", cal_file);
if (safe_write(outfile, (char *)(sp->greenweight),
if (safe_write(outfile, (char *)(sp->greenweight),
sp->scanheadwidth * sizeof(long)) < 0)
DBG(10, "Write error on calibration file %s", cal_file);
if (safe_write(outfile, (char *)(sp->blueweight),
if (safe_write(outfile, (char *)(sp->blueweight),
sp->scanheadwidth * sizeof(long)) < 0)
DBG(10, "Write error on calibration file %s", cal_file);
if (safe_write(outfile, (char *)(sp->gamma), 32) < 0)
@@ -1198,7 +1198,7 @@ static unsigned long column_sum(image_segment *image, int x)
}
static int scanner_setup_params(unsigned char *buf, scanner_parameters *sp,
static int scanner_setup_params(unsigned char *buf, scanner_parameters *sp,
scan_parameters *scanp)
{
int scaled_width, scaled_height;
@@ -1218,14 +1218,14 @@ static int scanner_setup_params(unsigned char *buf, scanner_parameters *sp,
buf[3] = 0x58;
}
scaled_width = scanp->width <<
scaled_width = scanp->width <<
(sp->natural_xresolution - scanp->xresolution);
/* YO! This needs fixing if we ever use yresolution! */
scaled_height = scanp->height <<
scaled_height = scanp->height <<
(sp->natural_xresolution - scanp->xresolution);
scaled_xoff = scanp->xoffset <<
scaled_xoff = scanp->xoffset <<
(sp->natural_xresolution - scanp->xresolution);
scaled_yoff = scanp->yoffset <<
scaled_yoff = scanp->yoffset <<
(sp->natural_xresolution - scanp->xresolution);
/* Input resolution */
@@ -1247,7 +1247,7 @@ static int scanner_setup_params(unsigned char *buf, scanner_parameters *sp,
buf[14] = (scaled_yoff & 0xff00) >> 8;
buf[15] = scaled_yoff & 0xff;
/* Width of image to be scanned */
/* Width of image to be scanned */
buf[16] = (scaled_width & 0xff000000) >> 24;
buf[17] = (scaled_width & 0xff0000) >> 16;
buf[18] = (scaled_width & 0xff00) >> 8;
@@ -1260,7 +1260,7 @@ static int scanner_setup_params(unsigned char *buf, scanner_parameters *sp,
buf[23] = scaled_height & 0xff;
/* These appear to be the only two colour mode possibilities.
/* These appear to be the only two colour mode possibilities.
Pure black-and-white mode probably just uses greyscale and
then gets its contrast adjusted by the driver. I forget. */
if (scanp->mode == 1) /* Truecolour */
@@ -1307,15 +1307,15 @@ int sanei_canon_pp_sleep_scanner(struct parport *port)
int sanei_canon_pp_detect(struct parport *port, int mode)
{
/*int caps;*/
/* This code needs to detect whether or not a scanner is present on
* the port, quickly and reliably. Fast version of
* sanei_canon_pp_initialise()
/* This code needs to detect whether or not a scanner is present on
* the port, quickly and reliably. Fast version of
* sanei_canon_pp_initialise()
*
* If this detect returns true, a more comprehensive check will
* If this detect returns true, a more comprehensive check will
* be conducted
* Return values:
* Return values:
* 0 = scanner present
* anything else = scanner not present
* anything else = scanner not present
* PRE: port is open/unclaimed
* POST: port is closed/unclaimed
*/
@@ -1343,9 +1343,9 @@ int sanei_canon_pp_detect(struct parport *port, int mode)
return 0;
}
static int send_command(struct parport *port, unsigned char *buf, int bufsize,
static int send_command(struct parport *port, unsigned char *buf, int bufsize,
int delay, int timeout)
/* Sends a command until the scanner says it is ready.
/* Sends a command until the scanner says it is ready.
* sleeps for delay microsecs between reads
* returns -1 on error, -2 on timeout */
{
@@ -1359,7 +1359,7 @@ static int send_command(struct parport *port, unsigned char *buf, int bufsize,
/* sleep a bit */
usleep(delay);
} while (sanei_canon_pp_check_status(port) &&
} while (sanei_canon_pp_check_status(port) &&
retries++ < (timeout/delay));
if (retries >= (timeout/delay)) return -2;
backend/canon_pp-dev.h
+6 -6
View File
@@ -42,7 +42,7 @@
canon_pp-dev.h: $Revision$
This file is part of the canon_pp backend, supporting Canon FBX30P
This file is part of the canon_pp backend, supporting Canon FBX30P
and NX40P scanners and also part of the stand-alone driver.
Simon Krix <kinsei@users.sourceforge.net>
@@ -105,9 +105,9 @@ typedef struct scanner_parameter_struct
int max_xresolution;
int max_yresolution;
/* ID String. Should only be 38(?) bytes long, so we can
/* ID String. Should only be 38(?) bytes long, so we can
reduce the size later. */
char id_string[80];
char id_string[80];
/* Short, readable scanner name, such as "FB330P" */
char name[40];
@@ -120,7 +120,7 @@ typedef struct scanner_parameter_struct
unsigned long *blueweight;
/* Not understood white-balance/gain values */
unsigned char gamma[32];
unsigned char gamma[32];
/* Type of scanner ( 0 = *20P, 1 = [*30P|*40P] ) */
unsigned char type;
@@ -154,7 +154,7 @@ typedef struct image_segment_struct
/* Scan-related functions ========================= */
/* Brings the scanner in and out of transparent mode
/* Brings the scanner in and out of transparent mode
and detects model information */
int sanei_canon_pp_initialise(scanner_parameters *sp, int mode);
int sanei_canon_pp_close_scanner(scanner_parameters *sp);
@@ -162,7 +162,7 @@ int sanei_canon_pp_close_scanner(scanner_parameters *sp);
/* Image scanning functions */
int sanei_canon_pp_init_scan(scanner_parameters *sp, scan_parameters *scanp);
int sanei_canon_pp_read_segment(image_segment **dest, scanner_parameters *sp,
int sanei_canon_pp_read_segment(image_segment **dest, scanner_parameters *sp,
scan_parameters *scanp, int scanline_count, int do_adjust,
int scanlines_left);
backend/canon_pp-io.c
+45 -45
View File
@@ -41,7 +41,7 @@
-----
This file is part of the canon_pp backend, supporting Canon CanoScan
Parallel scanners and also distributed as part of the stand-alone driver.
Parallel scanners and also distributed as part of the stand-alone driver.
canon_pp-io.c: $Revision$
@@ -89,8 +89,8 @@ static void DBG(int level, const char *format, ...)
/* 0x00 = Nibble Mode (M1284_NIBBLE)
0x10 = ECP Mode (M1284_ECP)
The scanner driver seems not to support ECP RLE mode
(which is a huge bummer because compression would be
The scanner driver seems not to support ECP RLE mode
(which is a huge bummer because compression would be
ace) nor EPP mode.
*/
static int ieee_mode = M1284_NIBBLE;
@@ -109,12 +109,12 @@ static void scanner_chessboard_control(struct parport *port);
static void scanner_chessboard_data(struct parport *port, int mode);
/* Used by read_data */
static int ieee_transfer(struct parport *port, int length,
static int ieee_transfer(struct parport *port, int length,
unsigned char *data);
/* Low level functions */
static int readstatus(struct parport *port);
static int expect(struct parport *port, const char *step, int s,
static int expect(struct parport *port, const char *step, int s,
int mask, unsigned int delay);
/* Port-level functions */
@@ -124,7 +124,7 @@ static void outboth(struct parport *port, int d, int c);
/************************************/
/*
/*
* IEEE 1284 defines many values for m,
* but these scanners only support 2: nibble and ECP modes.
* And no data compression either (argh!)
@@ -144,7 +144,7 @@ int sanei_canon_pp_wake_scanner(struct parport *port, int mode)
int i = 0;
int tmp;
int max_cycles = 3;
tmp = readstatus(port);
/* Reset only works on 30/40 models */
@@ -171,7 +171,7 @@ int sanei_canon_pp_wake_scanner(struct parport *port, int mode)
scanner_chessboard_control(port);
scanner_chessboard_data(port, mode);
if (expect(port, NULL, 0x03, 0x1f, 800000) &&
if (expect(port, NULL, 0x03, 0x1f, 800000) &&
(mode == INITMODE_AUTO))
{
/* 630 Style init failed, try 620 style */
@@ -187,7 +187,7 @@ int sanei_canon_pp_wake_scanner(struct parport *port, int mode)
usleep(100000);
}
} while ((i < max_cycles) && (!expect(port,"Scanner wakeup reply 2",
} while ((i < max_cycles) && (!expect(port,"Scanner wakeup reply 2",
0x03, 0x1f, 100000) == 0));
/* Block just after chessboarding
@@ -201,7 +201,7 @@ int sanei_canon_pp_wake_scanner(struct parport *port, int mode)
return -1;
outboth(port, 0, NSELECTIN | NINIT | HOSTCLK); /* Clear D, C3+, C1- */
/* If we had to try the wakeup cycle more than once, we should wait
/* If we had to try the wakeup cycle more than once, we should wait
* here for 10 seconds to let the scanner pull itself together -
* it can actually take longer, but I can't wait that long! */
if (i > 1)
@@ -227,7 +227,7 @@ int sanei_canon_pp_write(struct parport *port, int length, unsigned char *data)
DBG(10,"%02x ", data[count]);
if (count % 20 == 19)
DBG(10,"\n ");
}
}
if (count % 20 != 19) DBG(10,"\n");
#endif
@@ -238,20 +238,20 @@ int sanei_canon_pp_write(struct parport *port, int length, unsigned char *data)
case M1284_BECP:
case M1284_ECPRLE:
case M1284_ECPSWE:
case M1284_ECP:
case M1284_ECP:
ieee1284_negotiate(port, ieee_mode);
if (ieee1284_ecp_write_data(port, 0, (char *)data,
if (ieee1284_ecp_write_data(port, 0, (char *)data,
length) != length)
return -1;
break;
case M1284_NIBBLE:
if (ieee1284_compat_write(port, 0, (char *)data,
case M1284_NIBBLE:
if (ieee1284_compat_write(port, 0, (char *)data,
length) != length)
return -1;
break;
default:
DBG(0, "Invalid mode in write!\n");
}
}
DBG(100, "<< write");
@@ -265,7 +265,7 @@ int sanei_canon_pp_read(struct parport *port, int length, unsigned char *data)
DBG(200, "NEW read_data (%i bytes):\n", length);
ieee1284_negotiate(port, ieee_mode);
/* This is special; Nibble mode needs a little
/* This is special; Nibble mode needs a little
extra help from us. */
if (ieee_mode == M1284_NIBBLE)
@@ -275,7 +275,7 @@ int sanei_canon_pp_read(struct parport *port, int length, unsigned char *data)
if (expect(port, "Read Data 1", 0, NDATAAVAIL, 6000000))
{
DBG(10,"Error 1\n");
ieee1284_terminate(port);
ieee1284_terminate(port);
return 1;
}
outcont(port, HOSTBUSY, HOSTBUSY);
@@ -283,7 +283,7 @@ int sanei_canon_pp_read(struct parport *port, int length, unsigned char *data)
if (expect(port, "Read Data 2", NACK, NACK, 1000000))
{
DBG(1,"Error 2\n");
ieee1284_terminate(port);
ieee1284_terminate(port);
return 1;
}
if (expect(port, "Read Data 3 (Ready?)", 0, PERROR, 1000000))
@@ -319,7 +319,7 @@ int sanei_canon_pp_read(struct parport *port, int length, unsigned char *data)
/* If 0 bytes were transferred, it's a legal
"No data" condition (I think). Otherwise,
it may have run out of buffer.. keep reading*/
if (count < 0) {
DBG(10, "Couldn't read enough data (need %d more "
"of %d)\n", length+count,length+offset);
@@ -344,14 +344,14 @@ int sanei_canon_pp_read(struct parport *port, int length, unsigned char *data)
DBG(10,"%02x ", data[count]);
if (count % 20 == 19)
DBG(10,"\n ");
}
}
if (count % 20 != 19) DBG(10,"\n");
}
else
{
DBG(10,"Read: %i bytes\n", length);
}
}
#endif
if (ieee_mode == M1284_NIBBLE)
@@ -367,17 +367,17 @@ static int ieee_transfer(struct parport *port, int length, unsigned char *data)
DBG(100, "IEEE transfer (%i bytes)\n", length);
switch (ieee_mode)
switch (ieee_mode)
{
case M1284_BECP:
case M1284_ECP:
case M1284_ECPRLE:
case M1284_ECPSWE:
result = ieee1284_ecp_read_data(port, 0, (char *)data,
result = ieee1284_ecp_read_data(port, 0, (char *)data,
length);
break;
case M1284_NIBBLE:
result = ieee1284_nibble_read(port, 0, (char *)data,
result = ieee1284_nibble_read(port, 0, (char *)data,
length);
break;
default:
@@ -405,22 +405,22 @@ int sanei_canon_pp_check_status(struct parport *port)
{
case 0x0606:
DBG(200, "Ready - 0x0606\n");
return 0;
return 0;
break;
case 0x1414:
DBG(200, "Busy - 0x1414\n");
DBG(200, "Busy - 0x1414\n");
return 1;
break;
case 0x0805:
DBG(200, "Resetting - 0x0805\n");
DBG(200, "Resetting - 0x0805\n");
return 3;
break;
case 0x1515:
DBG(1, "!! Invalid Command - 0x1515\n");
return 2;
return 2;
break;
case 0x0000:
DBG(200, "Nothing - 0x0000");
DBG(200, "Nothing - 0x0000");
return 4;
break;
@@ -451,9 +451,9 @@ static void outboth(struct parport *port, int d, int c)
{
ieee1284_write_data(port, d & 0xff);
outcont(port, c, 0x0f);
}
}
/* readstatus():
/* readstatus():
Returns the LOGIC value of the S register (ie: all input lines)
shifted right to to make it easier to read. Note: S5 is inverted
by ieee1284_read_status so we don't need to */
@@ -472,7 +472,7 @@ static void scanner_chessboard_control(struct parport *port)
outcont(port, 13, 0xf);
usleep(10);
outcont(port, 7, 0xf);
usleep(10);
usleep(10);
}
static void scanner_chessboard_data(struct parport *port, int mode)
@@ -490,28 +490,28 @@ static void scanner_chessboard_data(struct parport *port, int mode)
outdata(port, 0x55);
else
outdata(port, 0x33);
outcont(port, HOSTBUSY, HOSTBUSY);
outcont(port, HOSTBUSY, HOSTBUSY);
usleep(10);
outcont(port, 0, HOSTBUSY);
outcont(port, 0, HOSTBUSY);
usleep(10);
outcont(port, HOSTBUSY, HOSTBUSY);
outcont(port, HOSTBUSY, HOSTBUSY);
usleep(10);
if (mode == INITMODE_20P)
outdata(port, 0xaa);
else
outdata(port, 0xcc);
outcont(port, HOSTBUSY, HOSTBUSY);
outcont(port, HOSTBUSY, HOSTBUSY);
usleep(10);
outcont(port, 0, HOSTBUSY);
outcont(port, 0, HOSTBUSY);
usleep(10);
outcont(port, HOSTBUSY, HOSTBUSY);
outcont(port, HOSTBUSY, HOSTBUSY);
usleep(10);
}
}
/* Reset the scanner. At least, it works 50% of the time. */
static int scanner_reset(struct parport *port)
static int scanner_reset(struct parport *port)
{
/* Resetting only works for the *30Ps, sorry */
@@ -545,7 +545,7 @@ static int scanner_reset(struct parport *port)
outcont(port, 0x0f, 0xf); /* All lines must be 1. */
/* All lines 1 */
if (expect(port, "Reset 2 response 2 (READY)",
if (expect(port, "Reset 2 response 2 (READY)",
0x1f, 0x1f, 500000))
return 1;
@@ -556,9 +556,9 @@ static int scanner_reset(struct parport *port)
return 0;
}
/* A timed version of expect, which will wait for delay before erroring
/* A timed version of expect, which will wait for delay before erroring
This is the one and only one we should be using */
static int expect(struct parport *port, const char *msg, int s,
static int expect(struct parport *port, const char *msg, int s,
int mask, unsigned int delay)
{
struct timeval tv;
@@ -591,7 +591,7 @@ int sanei_canon_pp_scanner_init(struct parport *port)
/* In Windows, this is always ECP (or an attempt at it) */
if (sanei_canon_pp_write(port, 10, cmd_init))
return -1;
/* Note that we don't really mind what the status was as long as it
/* Note that we don't really mind what the status was as long as it
* wasn't a read error (returns -1) */
/* In fact, the 620P gives an error on that last command, but they
* keep going anyway */
@@ -605,7 +605,7 @@ int sanei_canon_pp_scanner_init(struct parport *port)
if (tmp < 0)
return -1;
DBG(10, "scanner_init: Giving the scanner a snooze...\n");
usleep(500000);
usleep(500000);
tries++;
backend/canon_pp-io.h
+4 -4
View File
@@ -42,7 +42,7 @@
canon_pp-io.h: $Revision$
This file is part of the canon_pp backend, supporting Canon FBX30P
This file is part of the canon_pp backend, supporting Canon FBX30P
and NX40P scanners and also distributed as part of the stand-alone
driver.
@@ -50,14 +50,14 @@
*/
#ifndef CANON_PP_IO_H
#define CANON_PP_IO_H
#define CANON_PP_IO_H
/* Actual Interface */
void sanei_canon_pp_set_ieee1284_mode(int m);
int sanei_canon_pp_wake_scanner(struct parport *port, int mode);
int sanei_canon_pp_write(struct parport *port, int length,
int sanei_canon_pp_write(struct parport *port, int length,
unsigned char *data);
int sanei_canon_pp_read(struct parport *port, int length,
int sanei_canon_pp_read(struct parport *port, int length,
unsigned char *data);
int sanei_canon_pp_check_status(struct parport *port);
int sanei_canon_pp_scanner_init(struct parport *port);
backend/canon_pp.c
+144 -144
View File
@@ -42,7 +42,7 @@
canon_pp.c: $Revision$
This file is part of the canon_pp backend, supporting Canon FBX30P
This file is part of the canon_pp backend, supporting Canon FBX30P
and NX40P scanners
*/
@@ -114,9 +114,9 @@ static SANE_Bool force_nibble = SANE_FALSE;
/* Constants */
/* Colour Modes */
static const SANE_String_Const cmodes[] = {
SANE_VALUE_SCAN_MODE_GRAY,
SANE_VALUE_SCAN_MODE_COLOR,
static const SANE_String_Const cmodes[] = {
SANE_VALUE_SCAN_MODE_GRAY,
SANE_VALUE_SCAN_MODE_COLOR,
NULL };
/* bit depths */
@@ -139,7 +139,7 @@ static const SANE_Int res600[] = {4, 75, 150, 300, 600};
sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
{
SANE_Status status = SANE_STATUS_GOOD;
int i, tmp;
int i, tmp;
int tmp_im = INITMODE_AUTO;
FILE *fp;
char line[81]; /* plus 1 for a null */
@@ -150,7 +150,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
DBG_INIT();
#if defined PACKAGE && defined VERSION
DBG(2, ">> sane_init (version %s null, authorize %s null): " PACKAGE " " VERSION "\n",
DBG(2, ">> sane_init (version %s null, authorize %s null): " PACKAGE " " VERSION "\n",
(vc) ? "!=" : "==", (cb) ? "!=" : "==");
#endif
@@ -192,8 +192,8 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
/* just to be extra sure, the line will always have an end: */
line[sizeof(line)-1] = '\0';
/*
* Read information from config file: pixel weight location and default
/*
* Read information from config file: pixel weight location and default
* port.
*/
if((fp = sanei_config_open(CANONP_CONFIG_FILE)))
@@ -208,24 +208,24 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
if(strncmp(line,"calibrate ", 10) == 0)
{
/* warning: pointer trickyness ahead
/* warning: pointer trickyness ahead
* Do not free tmp_port! */
DBG(40, "sane_init: calibrate line, %s\n",
DBG(40, "sane_init: calibrate line, %s\n",
line);
tmp_wf = strdup(line+10);
tmp_port = strstr(tmp_wf, " ");
if ((tmp_port == tmp_wf) || (tmp_port == NULL))
{
/* They have used an old style config
/* They have used an old style config
* file which does not specify scanner
* Assume first port */
DBG(1, "sane_init: old config line:"
"\"%s\". Please add "
"a port argument.\n",
"a port argument.\n",
line);
/* first_dev should never be null here
* because we found at least one
* because we found at least one
* parallel port above */
first_dev->weights_file = tmp_wf;
DBG(100, "sane_init: Successfully "
@@ -236,7 +236,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
}
/* Now find which scanner wants
/* Now find which scanner wants
* this calibration file */
s_tmp = first_dev;
DBG(100, "sane_init: Finding scanner on port "
@@ -247,7 +247,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
tmp_port+1))
{
DBG(100, "sane_init: Found!\n");
/* Now terminate the weight
/* Now terminate the weight
* file string */
*tmp_port = '\0';
s_tmp->weights_file = tmp_wf;
@@ -255,7 +255,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
"cal, for port"
" '%s', weight"
" file is '%s'"
".\n",
".\n",
s_tmp->params.
port->name,
tmp_wf);
@@ -295,7 +295,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
if(strncmp(line,"init_mode ", 10) == 0)
{
/* parse what sort of initialisation mode to
/* parse what sort of initialisation mode to
* use */
if (strncmp(line+10, "FB620P", 6) == 0)
tmp_im = INITMODE_20P;
@@ -311,7 +311,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
if (tmp_port == NULL)
{
/* first_dev should never be null here
* because we found at least one
* because we found at least one
* parallel port above */
first_dev->init_mode = tmp_im;
DBG(100, "sane_init: Parsed init-1.\n");
@@ -344,9 +344,9 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
}
DBG(1, "sane_init: Unknown configuration command!");
}
}
fclose (fp);
}
}
/* There should now be a LL of ports starting at first_dev */
@@ -355,23 +355,23 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
/* Assume there's no scanner present until proven otherwise */
s_tmp->scanner_present = SANE_FALSE;
/* Try to detect if there's a scanner there, and if so,
/* Try to detect if there's a scanner there, and if so,
* what sort of scanner it is */
status = detect_mode(s_tmp);
if (status != SANE_STATUS_GOOD)
if (status != SANE_STATUS_GOOD)
{
DBG(10,"sane_init: Error detecting port mode on %s!\n",
s_tmp->params.port->name);
s_tmp->scanner_present = SANE_FALSE;
continue;
}
}
/* detect_mode suceeded, so the port is open. This beholdens
* us to call ieee1284_close in any of the remaining error
* cases in this loop. */
#if 0
tmp = sanei_canon_pp_detect(s_tmp->params.port,
tmp = sanei_canon_pp_detect(s_tmp->params.port,
s_tmp->init_mode);
@@ -383,7 +383,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
s_tmp->ieee1284_mode = M1284_NIBBLE;
sanei_canon_pp_set_ieee1284_mode(s_tmp->ieee1284_mode);
tmp = sanei_canon_pp_detect(s_tmp->params.port,
tmp = sanei_canon_pp_detect(s_tmp->params.port,
s_tmp->init_mode);
}
/* still no go? */
@@ -395,7 +395,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
ieee1284_close(s_tmp->params.port);
continue;
}
#endif
/* all signs point to yes, try it out */
if (ieee1284_claim(s_tmp->params.port) != E1284_OK) {
@@ -405,9 +405,9 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
ieee1284_close(s_tmp->params.port);
continue;
}
DBG(2, "sane_init: >> initialise\n");
tmp = sanei_canon_pp_initialise(&(s_tmp->params),
tmp = sanei_canon_pp_initialise(&(s_tmp->params),
s_tmp->init_mode);
DBG(2, "sane_init: << %d initialise\n", tmp);
if (tmp) {
@@ -420,13 +420,13 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
continue;
}
/* put it back to sleep until we're ready to
/* put it back to sleep until we're ready to
* open for business again - this will only work
* if we actually have a scanner there! */
DBG(100, "sane_init: And back to sleep again\n");
sanei_canon_pp_sleep_scanner(s_tmp->params.port);
/* leave the port open but not claimed - this is regardless
/* leave the port open but not claimed - this is regardless
* of the return value of initialise */
ieee1284_release(s_tmp->params.port);
@@ -435,7 +435,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
if (fix_weights_file(s_tmp) != SANE_STATUS_GOOD) {
DBG(1, "sane_init: Eeek! fix_weights_file failed for "
"scanner on port %s!\n",
"scanner on port %s!\n",
s_tmp->params.port->name);
/* non-fatal.. scans will look ugly as sin unless
* they calibrate */
@@ -462,7 +462,7 @@ sane_init (SANE_Int *vc, SANE_Auth_Callback cb)
*************************************************************************/
SANE_Status
sane_get_devices (const SANE_Device ***dl, SANE_Bool local)
{
{
static const SANE_Device **devlist;
CANONP_Scanner *dev;
int i;
@@ -521,7 +521,7 @@ sane_open (SANE_String_Const name, SANE_Handle *h)
DBG(2, ">> sane_open (h=%p, name=\"%s\")\n", (void *)h, name);
if ((h == NULL) || (name == NULL))
if ((h == NULL) || (name == NULL))
{
DBG(2,"sane_open: Null pointer received!\n");
return SANE_STATUS_INVAL;
@@ -543,12 +543,12 @@ sane_open (SANE_String_Const name, SANE_Handle *h)
while((cs != NULL) && strcmp(cs->params.port->name, name))
cs = cs->next;
/* if we didn't find the port they want, or there's no scanner
/* if we didn't find the port they want, or there's no scanner
* there, we just want to find _any_ scanner */
if ((cs == NULL) || (cs->scanner_present != SANE_TRUE))
{
cs = first_dev;
while((cs != NULL) &&
while((cs != NULL) &&
(cs->scanner_present == SANE_FALSE))
cs = cs->next;
}
@@ -563,7 +563,7 @@ sane_open (SANE_String_Const name, SANE_Handle *h)
}
if (cs == NULL)
if (cs == NULL)
{
DBG(2,"sane_open: No scanner found or requested port "
"doesn't exist (%s)\n", name);
@@ -575,15 +575,15 @@ sane_open (SANE_String_Const name, SANE_Handle *h)
"(%s)\n", name);
return SANE_STATUS_IO_ERROR;
}
if (cs->opened == SANE_TRUE)
if (cs->opened == SANE_TRUE)
{
DBG(2,"sane_open; Oi!, That scanner's already open.\n");
return SANE_STATUS_DEVICE_BUSY;
}
/* If the scanner has already been opened once, we don't have to do
/* If the scanner has already been opened once, we don't have to do
* this setup again */
if (cs->setup == SANE_TRUE)
if (cs->setup == SANE_TRUE)
{
cs->opened = SANE_TRUE;
*h = (SANE_Handle)cs;
@@ -613,11 +613,11 @@ sane_open (SANE_String_Const name, SANE_Handle *h)
}
if (cs->weights_file != NULL)
DBG(2, "sane_open: >> load_weights(%s, %p)\n",
cs->weights_file,
DBG(2, "sane_open: >> load_weights(%s, %p)\n",
cs->weights_file,
(const void *)(&(cs->params)));
else
DBG(2, "sane_open: >> load_weights(NULL, %p)\n",
DBG(2, "sane_open: >> load_weights(NULL, %p)\n",
(const void *)(&(cs->params)));
tmp = sanei_canon_pp_load_weights(cs->weights_file, &(cs->params));
DBG(2, "sane_open: << %d load_weights\n", tmp);
@@ -638,10 +638,10 @@ sane_open (SANE_String_Const name, SANE_Handle *h)
DBG(1, "sane_open: WARNING: adjust_gamma returned "
"%d!\n", tmp);
DBG(10, "sane_open: after adjust_gamma Status = %i\n",
DBG(10, "sane_open: after adjust_gamma Status = %i\n",
sanei_canon_pp_check_status(cs->params.port));
}
/* Configure ranges etc */
@@ -744,11 +744,11 @@ sane_control_option (SANE_Handle h, SANE_Int opt, SANE_Action act,
int i = 0, tmp, maxresi;
DBG(2, ">> sane_control_option (h=%p, opt=%d, act=%d)\n",
h,opt,act);
/* Do some sanity checks on the parameters
h,opt,act);
/* Do some sanity checks on the parameters
* note that val can be null for buttons */
if ((h == NULL) || ((val == NULL) && (opt != OPT_CAL)))
/* || (info == NULL)) - Don't check this any more..
if ((h == NULL) || ((val == NULL) && (opt != OPT_CAL)))
/* || (info == NULL)) - Don't check this any more..
* frontends seem to like passing a null */
{
DBG(1,"sane_control_option: Frontend passed me a null! "
@@ -757,7 +757,7 @@ sane_control_option (SANE_Handle h, SANE_Int opt, SANE_Action act,
return SANE_STATUS_INVAL;
}
if (((unsigned)opt) >= NUM_OPTIONS)
if (((unsigned)opt) >= NUM_OPTIONS)
{
DBG(1,"sane_control_option: I don't do option %d.\n", opt);
return SANE_STATUS_INVAL;
@@ -777,17 +777,17 @@ sane_control_option (SANE_Handle h, SANE_Int opt, SANE_Action act,
return SANE_STATUS_DEVICE_BUSY;
}
switch(act)
switch(act)
{
case SANE_ACTION_GET_VALUE:
switch (opt)
switch (opt)
{
case OPT_COLOUR_MODE:
strcpy((char *)val,
strcpy((char *)val,
cmodes[cs->vals[opt]]);
break;
case OPT_DEPTH:
strcpy((char *)val,
strcpy((char *)val,
depths[cs->vals[opt]]);
break;
case OPT_RESOLUTION:
@@ -812,40 +812,40 @@ sane_control_option (SANE_Handle h, SANE_Int opt, SANE_Action act,
maxresi = cs->opt[OPT_RESOLUTION].
constraint.word_list[0];
while ((cs->vals[opt] <= maxresi) &&
while ((cs->vals[opt] <= maxresi) &&
(res600[cs->vals[opt]]
< *((int *)val)))
{
cs->vals[opt] += 1;
}
if (res600[cs->vals[opt]] !=
if (res600[cs->vals[opt]] !=
*((int *)val))
{
if (info != NULL) *info |=
if (info != NULL) *info |=
SANE_INFO_INEXACT;
}
break;
case OPT_COLOUR_MODE:
cs->vals[opt] = 0;
while ((cmodes[cs->vals[opt]] != NULL)
&& strcmp(cmodes[cs->vals[opt]],
&& strcmp(cmodes[cs->vals[opt]],
(char *)val))
{
cs->vals[opt] += 1;
}
if (info != NULL) *info |=
if (info != NULL) *info |=
SANE_INFO_RELOAD_PARAMS;
break;
case OPT_DEPTH:
cs->vals[opt] = 0;
while ((depths[cs->vals[opt]] != NULL)
&& strcmp(depths[cs->vals[opt]],
&& strcmp(depths[cs->vals[opt]],
(char *)val))
{
cs->vals[opt] += 1;
}
if (info != NULL) *info |=
if (info != NULL) *info |=
SANE_INFO_RELOAD_PARAMS;
break;
case OPT_TL_X:
@@ -861,34 +861,34 @@ sane_control_option (SANE_Handle h, SANE_Int opt, SANE_Action act,
if ((cs->weights_file==NULL) ||
cs->cal_readonly
)
DBG(2, ">> calibrate(x, "
DBG(2, ">> calibrate(x, "
"NULL)\n");
else
DBG(2, ">> calibrate(x,"
"%s)\n",
cs->weights_file);
if (cs->cal_readonly) tmp =
if (cs->cal_readonly) tmp =
sanei_canon_pp_calibrate(
&(cs->params),
&(cs->params),
NULL);
else tmp = sanei_canon_pp_calibrate(
&(cs->params),
&(cs->params),
cs->weights_file);
DBG(2, "<< %d calibrate\n",
DBG(2, "<< %d calibrate\n",
tmp);
if (tmp != 0) {
DBG(1, "sane_control_option: "
"WARNING: "
"calibrate "
"returned %d!",
"returned %d!",
tmp);
cs->cal_valid =
cs->cal_valid =
SANE_FALSE;
return SANE_STATUS_IO_ERROR;
} else {
cs->cal_valid =
cs->cal_valid =
SANE_TRUE;
}
@@ -930,7 +930,7 @@ sane_get_parameters (SANE_Handle h, SANE_Parameters *params)
{
int res, max_width, max_height, max_res;
CANONP_Scanner *cs = ((CANONP_Scanner *)h);
DBG(2, ">> sane_get_parameters (h=%p, params=%p)\n", (void*)h,
DBG(2, ">> sane_get_parameters (h=%p, params=%p)\n", (void*)h,
(void*)params);
if (h == NULL) return SANE_STATUS_INVAL;
@@ -946,16 +946,16 @@ sane_get_parameters (SANE_Handle h, SANE_Parameters *params)
* version, so this will always work. */
res = res600[cs->vals[OPT_RESOLUTION]];
/*
* These don't change whether we're scanning or not
/*
* These don't change whether we're scanning or not
* NOTE: Assumes options don't change after scanning commences, which
* is part of the standard
*/
/* Copy the options stored in the vals into the scaninfo */
params->pixels_per_line =
params->pixels_per_line =
((cs->vals[OPT_BR_X] - cs->vals[OPT_TL_X]) * res) / MM_PER_IN;
params->lines = ((cs->vals[OPT_BR_Y] - cs->vals[OPT_TL_Y]) * res)
params->lines = ((cs->vals[OPT_BR_Y] - cs->vals[OPT_TL_Y]) * res)
/ MM_PER_IN;
/* FIXME: Magic numbers ahead! */
@@ -970,17 +970,17 @@ sane_get_parameters (SANE_Handle h, SANE_Parameters *params)
max_width = cs->params.scanheadwidth / (max_res / res);
max_height = (cs->params.scanheadwidth == 2552 ? 3508 : 7016) /
max_height = (cs->params.scanheadwidth == 2552 ? 3508 : 7016) /
(max_res / res);
if(params->pixels_per_line > max_width)
if(params->pixels_per_line > max_width)
params->pixels_per_line = max_width;
if(params->lines > max_height) params->lines = max_height;
params->depth = cs->vals[OPT_DEPTH] ? 16 : 8;
switch (cs->vals[OPT_COLOUR_MODE])
switch (cs->vals[OPT_COLOUR_MODE])
{
case 0:
params->format = SANE_FRAME_GRAY;
@@ -997,7 +997,7 @@ sane_get_parameters (SANE_Handle h, SANE_Parameters *params)
if (!(params->pixels_per_line)) {
params->last_frame = SANE_TRUE;
params->lines = 0;
}
}
/* Always the "last frame" */
params->last_frame = SANE_TRUE;
@@ -1009,7 +1009,7 @@ sane_get_parameters (SANE_Handle h, SANE_Parameters *params)
"max_res=%d, res=%d, max_height=%d, br_y=%d, tl_y=%d, "
"mm_per_in=%f\n",
params->bytes_per_line, params->pixels_per_line, params->lines,
max_res, res, max_height, cs->vals[OPT_BR_Y],
max_res, res, max_height, cs->vals[OPT_BR_Y],
cs->vals[OPT_TL_Y], MM_PER_IN);
DBG(2, "<< sane_get_parameters\n");
@@ -1047,18 +1047,18 @@ sane_start (SANE_Handle h)
res = res600[cs->vals[OPT_RESOLUTION]];
/* Copy the options stored in the vals into the scaninfo */
cs->scan.width = ((cs->vals[OPT_BR_X] - cs->vals[OPT_TL_X]) * res)
cs->scan.width = ((cs->vals[OPT_BR_X] - cs->vals[OPT_TL_X]) * res)
/ MM_PER_IN;
cs->scan.height = ((cs->vals[OPT_BR_Y] - cs->vals[OPT_TL_Y]) * res)
cs->scan.height = ((cs->vals[OPT_BR_Y] - cs->vals[OPT_TL_Y]) * res)
/ MM_PER_IN;
cs->scan.xoffset = (cs->vals[OPT_TL_X] * res) / MM_PER_IN;
cs->scan.yoffset = (cs->vals[OPT_TL_Y] * res) / MM_PER_IN;
/*
* These values have to pass the requirements of not exceeding
* dimensions (simple clipping) and both width values have to be some
* integer multiple of 4
/*
* These values have to pass the requirements of not exceeding
* dimensions (simple clipping) and both width values have to be some
* integer multiple of 4
*/
/* FIXME: Magic numbers ahead! */
@@ -1074,11 +1074,11 @@ sane_start (SANE_Handle h)
max_width = cs->params.scanheadwidth / (max_res / res);
max_height = (cs->params.scanheadwidth == 2552 ? 3508 : 7016) /
max_height = (cs->params.scanheadwidth == 2552 ? 3508 : 7016) /
(max_res / res);
if (cs->scan.width > max_width) cs->scan.width = max_width;
if (cs->scan.width + cs->scan.xoffset > max_width) cs->scan.xoffset =
if (cs->scan.width + cs->scan.xoffset > max_width) cs->scan.xoffset =
max_width - cs->scan.width;
if (cs->scan.height > max_height) cs->scan.height = max_height;
@@ -1104,7 +1104,7 @@ sane_start (SANE_Handle h)
cs->scan.xresolution = i;
cs->scan.yresolution = i;
if (((cs->vals[OPT_BR_Y] - cs->vals[OPT_TL_Y]) <= 0) ||
if (((cs->vals[OPT_BR_Y] - cs->vals[OPT_TL_Y]) <= 0) ||
((cs->vals[OPT_BR_X] - cs->vals[OPT_TL_X]) <= 0))
{
DBG(1,"sane_start: height = %d, Width = %d. "
@@ -1156,26 +1156,26 @@ sane_read (SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
static SANE_Byte *lbuf;
static unsigned int bytesleft;
DBG(2, ">> sane_read (h=%p, buf=%p, maxlen=%d)\n", h,
DBG(2, ">> sane_read (h=%p, buf=%p, maxlen=%d)\n", h,
(const void *)buf, maxlen);
/* default to returning 0 - for errors */
*lenp = 0;
if ((h == NULL) || (buf == NULL) || (lenp == NULL))
if ((h == NULL) || (buf == NULL) || (lenp == NULL))
{
DBG(1, "sane_read: This frontend's passing me dodgy gear! "
"(h=%p, buf=%p, lenp=%p)\n",
"(h=%p, buf=%p, lenp=%p)\n",
(void*)h, (void*)buf, (void*)lenp);
return SANE_STATUS_INVAL;
}
/* Now we have to see if we have some leftover from last time */
if (read_leftover != NULL)
if (read_leftover != NULL)
{
/* feed some more data in until we've run out - don't care
* whether or not we _think_ the scanner is scanning now,
/* feed some more data in until we've run out - don't care
* whether or not we _think_ the scanner is scanning now,
* because we may still have data left over to send */
DBG(200, "sane_read: didn't send it all last time\n");
@@ -1204,11 +1204,11 @@ sane_read (SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
return SANE_STATUS_GOOD;
}
}
}
/* Has the last scan ended (other than by cancelling)? */
if (((unsigned)cs->scan.height <= (unsigned)cs->lines_scanned)
if (((unsigned)cs->scan.height <= (unsigned)cs->lines_scanned)
|| (cs->sent_eof) || !(cs->scanning))
{
cs->sent_eof = SANE_TRUE;
@@ -1220,7 +1220,7 @@ sane_read (SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
return SANE_STATUS_EOF;
}
/* At this point we have to read more data from the scanner - or the
/* At this point we have to read more data from the scanner - or the
* scan has been cancelled, which means we have to call read_segment
* to leave the scanner consistant */
@@ -1230,17 +1230,17 @@ sane_read (SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
else
bpl = cs->scan.width * (cs->vals[OPT_COLOUR_MODE] ? 6 : 2);
/* New way: scan a whole scanner buffer full, and return as much as
* the frontend wants. It's faster and more reliable since the
/* New way: scan a whole scanner buffer full, and return as much as
* the frontend wants. It's faster and more reliable since the
* scanners crack the shits if we ask for too many small packets */
lines = (BUF_MAX * 4 / 5) / bpl;
if (lines > (cs->scan.height - cs->lines_scanned))
if (lines > (cs->scan.height - cs->lines_scanned))
lines = cs->scan.height - cs->lines_scanned;
if (!lines)
{
/* can't fit a whole line into the buffer
/* can't fit a whole line into the buffer
* (should never happen!) */
lines = 1;
}
@@ -1268,16 +1268,16 @@ sane_read (SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
DBG(10, "scan_params->: width=%d, height=%d, xoffset=%d, "
"yoffset=%d\n\txresolution=%d, yresolution=%d, "
"mode=%d, (lines=%d)\n",
cs->scan.width, cs->scan.height,
cs->scan.width, cs->scan.height,
cs->scan.xoffset, cs->scan.yoffset,
cs->scan.xresolution, cs->scan.yresolution,
cs->scan.mode, lines);
DBG(2, ">> read_segment(x, x, x, %d, %d, %d)\n",
lines, cs->cal_valid,
lines, cs->cal_valid,
cs->scan.height - cs->lines_scanned);
tmp = sanei_canon_pp_read_segment(&is, &(cs->params), &(cs->scan),
lines, cs->cal_valid,
tmp = sanei_canon_pp_read_segment(&is, &(cs->params), &(cs->scan),
lines, cs->cal_valid,
cs->scan.height - cs->lines_scanned);
DBG(2, "<< %d read_segment\n", tmp);
@@ -1361,7 +1361,7 @@ sane_read (SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
if ((unsigned)cs->lines_scanned >= cs->scan.height)
{
/* The scan is over! Don't need to call anything in the
/* The scan is over! Don't need to call anything in the
* hardware, it will sort itself out */
DBG(10, "sane_read: Scan is finished.\n");
cs->scanning = SANE_FALSE;
@@ -1392,7 +1392,7 @@ sane_cancel (SANE_Handle h)
read_leftover = NULL;
if (!(cs->scanning))
if (!(cs->scanning))
{
DBG(2, "<< sane_cancel (not scanning)\n");
return;
@@ -1431,7 +1431,7 @@ sane_close (SANE_Handle h)
sanei_canon_pp_close_scanner(&(cs->params));
cs->opened = SANE_FALSE;
/* if it was scanning, it's not any more */
cs->scanning = SANE_FALSE;
cs->sent_eof = SANE_TRUE;
@@ -1461,9 +1461,9 @@ sane_exit (void)
next = dev->next;
/* These were only created if the scanner has been init'd */
/* Should normally nullify pointers after freeing, but in
* this case we're about to free the whole structure so
* this case we're about to free the whole structure so
* theres not a lot of point. */
/* Constraints (mostly) allocated when the scanner is opened */
@@ -1513,17 +1513,17 @@ sane_exit (void)
* (Not part of the SANE API)
*
* Initialises a CANONP_Scanner data structure for a new device.
* NOTE: The device is not ready to scan until initialise() has been
* NOTE: The device is not ready to scan until initialise() has been
* called in scan library!
*
*************************************************************************/
static SANE_Status init_device(struct parport *pp)
static SANE_Status init_device(struct parport *pp)
{
int i;
static const char *hw_vendor = "CANON";
static const char *hw_type = "flatbed scanner";
static const char *opt_names[] = {
SANE_NAME_NUM_OPTIONS,
SANE_NAME_NUM_OPTIONS,
SANE_NAME_SCAN_RESOLUTION,
SANE_NAME_SCAN_MODE,
SANE_NAME_BIT_DEPTH,
@@ -1539,7 +1539,7 @@ static SANE_Status init_device(struct parport *pp)
#endif
};
static const char *opt_titles[] = {
SANE_TITLE_NUM_OPTIONS,
SANE_TITLE_NUM_OPTIONS,
SANE_TITLE_SCAN_RESOLUTION,
SANE_TITLE_SCAN_MODE,
SANE_TITLE_BIT_DEPTH,
@@ -1555,7 +1555,7 @@ static SANE_Status init_device(struct parport *pp)
#endif
};
static const char *opt_descs[] = {
SANE_DESC_NUM_OPTIONS,
SANE_DESC_NUM_OPTIONS,
SANE_DESC_SCAN_RESOLUTION,
SANE_DESC_SCAN_MODE,
SANE_DESC_BIT_DEPTH,
@@ -1583,7 +1583,7 @@ static SANE_Status init_device(struct parport *pp)
memset(cs, 0, sizeof(*cs));
#if 0
if ((cs->params.port = malloc(sizeof(*(cs->params.port)))) == NULL)
if ((cs->params.port = malloc(sizeof(*(cs->params.port)))) == NULL)
return SANE_STATUS_NO_MEM;
memcpy(cs->params.port, pp, sizeof(*pp));
@@ -1637,7 +1637,7 @@ static SANE_Status init_device(struct parport *pp)
cs->opt[OPT_RESOLUTION].unit = SANE_UNIT_DPI;
cs->opt[OPT_RESOLUTION].constraint_type = SANE_CONSTRAINT_WORD_LIST;
/* should never point at first element (wordlist size) */
cs->vals[OPT_RESOLUTION] = 1;
cs->vals[OPT_RESOLUTION] = 1;
DBG(100, "init_device: configuring opt: colour mode\n");
@@ -1689,8 +1689,8 @@ static SANE_Status init_device(struct parport *pp)
/* The calibration button */
cs->opt[OPT_CAL].type = SANE_TYPE_BUTTON;
cs->opt[OPT_CAL].constraint_type = SANE_CONSTRAINT_NONE;
if (cs->cal_readonly)
cs->opt[OPT_CAL].cap |= SANE_CAP_INACTIVE;
if (cs->cal_readonly)
cs->opt[OPT_CAL].cap |= SANE_CAP_INACTIVE;
#if 0
/* the gamma values (once we do them) */
@@ -1700,8 +1700,8 @@ static SANE_Status init_device(struct parport *pp)
#endif
/*
* NOTE: Ranges and lists are actually set when scanner is opened,
* becase that's when we find out what sort of scanner it is
* NOTE: Ranges and lists are actually set when scanner is opened,
* becase that's when we find out what sort of scanner it is
*/
DBG(100, "init_device: done opts\n");
@@ -1720,7 +1720,7 @@ static SANE_Status init_device(struct parport *pp)
/*************************************************************************
*
* These two are optional ones... maybe if I get really keen?
* These two are optional ones... maybe if I get really keen?
*
*************************************************************************/
SANE_Status
@@ -1739,7 +1739,7 @@ sane_set_io_mode (SANE_Handle h, SANE_Bool non_blocking)
SANE_Status
sane_get_select_fd (SANE_Handle h, SANE_Int *fdp)
{
DBG(2, ">> sane_get_select_fd (%p, %p) (not supported)\n", h,
DBG(2, ">> sane_get_select_fd (%p, %p) (not supported)\n", h,
(const void *)fdp);
DBG(2, "<< sane_get_select_fd\n");
return SANE_STATUS_UNSUPPORTED;
@@ -1762,7 +1762,7 @@ static int init_cal(char *file)
if (errno == ENOENT)
{
/* we need to try and make ~/.sane perhaps -
* find the last / in the file path, and try
* find the last / in the file path, and try
* to create it */
if ((tmp = strrchr(file, '/')) == NULL)
return -1;
@@ -1775,9 +1775,9 @@ static int init_cal(char *file)
if ((f = open(file, O_CREAT | O_WRONLY, 0600)) < 0)
return -1;
}
else
else
{
/* Error is something like access denied - too
/* Error is something like access denied - too
* hard to fix, so i give up... */
return -1;
}
@@ -1789,7 +1789,7 @@ static int init_cal(char *file)
/*************************************************************************
*
* fix_weights_file(): Ensures that the weights_file setting for a given
* fix_weights_file(): Ensures that the weights_file setting for a given
* scanner is valid
*
************************************************************************/
@@ -1821,7 +1821,7 @@ static SANE_Status fix_weights_file(CANONP_Scanner *cs)
/* Get the user's home dir if they used ~ */
if (cs->weights_file[0] == '~')
{
if ((tmp = malloc(PATH_MAX)) == NULL)
if ((tmp = malloc(PATH_MAX)) == NULL)
return SANE_STATUS_NO_MEM;
if ((myhome = getenv("HOME")) == NULL)
{
@@ -1832,7 +1832,7 @@ static SANE_Status fix_weights_file(CANONP_Scanner *cs)
return SANE_STATUS_INVAL;
}
strncpy(tmp, myhome, PATH_MAX);
strncpy(tmp+strlen(tmp), (cs->weights_file)+1,
strncpy(tmp+strlen(tmp), (cs->weights_file)+1,
PATH_MAX-strlen(tmp));
free(cs->weights_file);
@@ -1869,8 +1869,8 @@ static SANE_Status fix_weights_file(CANONP_Scanner *cs)
i = open(cs->weights_file, O_RDONLY);
if (i <= 0)
{
/*
* Open failed (do i care why?)
/*
* Open failed (do i care why?)
*/
DBG(2,"fix_weights_file: error opening cal "
"(%s)\n", strerror(errno));
@@ -1904,10 +1904,10 @@ static SANE_Status fix_weights_file(CANONP_Scanner *cs)
* PRE:
* cs->params.port is not open
* POST:
* cs->params.port is left opened iff SANE_STATUS_GOOD returned.
* cs->params.port is left opened iff SANE_STATUS_GOOD returned.
*/
SANE_Status detect_mode(CANONP_Scanner *cs)
SANE_Status detect_mode(CANONP_Scanner *cs)
{
int capabilities, tmp;
@@ -1925,7 +1925,7 @@ SANE_Status detect_mode(CANONP_Scanner *cs)
DBG(1, "detect_mode: Invalid port.\n");
break;
case E1284_SYS:
DBG(1, "detect_mode: System error: %s\n",
DBG(1, "detect_mode: System error: %s\n",
strerror(errno));
break;
case E1284_INIT:
@@ -1973,7 +1973,7 @@ SANE_Status detect_mode(CANONP_Scanner *cs)
{
cs->ieee1284_mode = M1284_ECP;
DBG(10, "detect_mode: Using ECP-H Mode\n");
}
}
else if (capabilities & CAP1284_ECPSWE)
{
cs->ieee1284_mode = M1284_ECPSWE;
@@ -1993,11 +1993,11 @@ SANE_Status detect_mode(CANONP_Scanner *cs)
}
/* Check to make sure ECP mode really is supported */
/* Have disabled the hardware ECP check because it's always supported
* by libieee1284 now, and it's too prone to hitting a ppdev bug
/* Have disabled the hardware ECP check because it's always supported
* by libieee1284 now, and it's too prone to hitting a ppdev bug
*/
/* Disabled check entirely.. check now in initialise when we
/* Disabled check entirely.. check now in initialise when we
* actually do a read */
#if 0
if ((cs->ieee1284_mode == M1284_ECP) ||
@@ -2005,17 +2005,17 @@ SANE_Status detect_mode(CANONP_Scanner *cs)
{
DBG(1, "detect_mode: attempting a 0 byte read, if we hang "
"here, it's a ppdev bug!\n");
/*
* 29/06/02
/*
* 29/06/02
* NOTE:
* This causes an infinite loop in ppdev on 2.4.18.
* Not checking on hardware ECP mode should work-around
* This causes an infinite loop in ppdev on 2.4.18.
* Not checking on hardware ECP mode should work-around
* effectively.
*
* I have sent email to twaugh about it, should be fixed in
* I have sent email to twaugh about it, should be fixed in
* 2.4.19 and above.
*/
if (ieee1284_ecp_read_data(cs->params.port, 0, NULL, 0) ==
if (ieee1284_ecp_read_data(cs->params.port, 0, NULL, 0) ==
E1284_NOTIMPL)
{
DBG(10, "detect_mode: Your version of libieee1284 "
backend/canon_pp.conf.in
+2 -2
View File
@@ -1,4 +1,4 @@
# Define which port to use if one isn't specified - you should only have
# Define which port to use if one isn't specified - you should only have
# one of these lines!
# This is the default port to be used - others will be detected
ieee1284 parport0
@@ -21,7 +21,7 @@ calibrate ~/.sane/canon_pp-calibration-pp0 parport0
# calibrate /etc/sane/my_calibration parport1
# Enable the next line if you're having trouble with ECP mode such as I/O
# Enable the next line if you're having trouble with ECP mode such as I/O
# errors. Nibble mode is slower, but more reliable.
#force_nibble
backend/canon_pp.h
+2 -2
View File
@@ -42,7 +42,7 @@
canon_pp.h: $Revision$
This file is part of the canon_pp backend, supporting Canon FBX30P
This file is part of the canon_pp backend, supporting Canon FBX30P
and NX40P scanners
*/
@@ -69,7 +69,7 @@
#define CANONP_CONFIG_FILE "canon_pp.conf"
/* options: num,res,colour,depth,tl-x,tl-y,br-x,br-y,cal */
/* preview option disabled */
#define NUM_OPTIONS 9
#define NUM_OPTIONS 9
#define BUF_MAX 64000
/* Indexes into options array */
backend/cardscan.c
+167 -167
View File
@@ -199,7 +199,7 @@ four times {
. . - sane_start() : start image acquisition
. . - sane_get_parameters() : returns actual scan parameters
. . - sane_read() : read image data (from pipe)
. . (sane_read called multiple times; after sane_read returns EOF,
. . (sane_read called multiple times; after sane_read returns EOF,
. . loop may continue with sane_start which may return a 2nd page
. . when doing duplex scans, or load the next page from the ADF)
. .
@@ -226,14 +226,14 @@ four times {
#include "cardscan.h"
#define DEBUG 1
#define BUILD 3
#define BUILD 3
/* values for SANE_DEBUG_CARDSCAN env var:
- errors 5
- function trace 10
- function detail 15
- get/setopt cmds 20
- usb cmd trace 25
- usb cmd trace 25
- usb cmd detail 30
- useless noise 35
*/
@@ -259,7 +259,7 @@ static struct scanner *scanner_devList = NULL;
/*
* Called by SANE initially.
*
*
* From the SANE spec:
* This function must be called before any other SANE function can be
* called. The behavior of a SANE backend is undefined if this
@@ -274,26 +274,26 @@ SANE_Status
sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
{
authorize = authorize; /* get rid of compiler warning */
DBG_INIT ();
DBG (10, "sane_init: start\n");
sanei_usb_init();
if (version_code)
*version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
DBG (5, "sane_init: cardscan backend %d.%d.%d, from %s\n",
SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
DBG (10, "sane_init: finish\n");
return SANE_STATUS_GOOD;
}
/*
* Called by SANE to find out about supported devices.
*
*
* From the SANE spec:
* This function can be used to query the list of devices that are
* available. If the function executes successfully, it stores a
@@ -306,7 +306,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
* returned (devices directly attached to the machine that SANE is
* running on). If it is false, the device list includes all remote
* devices that are accessible to the SANE library.
*
*
* SANE does not require that this function is called before a
* sane_open() call is performed. A device name may be specified
* explicitly by a user which would make it unnecessary and
@@ -324,64 +324,64 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
FILE *fp;
int num_devices=0;
int i=0;
local_only = local_only; /* get rid of compiler warning */
DBG (10, "sane_get_devices: start\n");
global_has_cal_buffer = 1;
global_lines_per_block = 16;
fp = sanei_config_open (CONFIG_FILE);
if (fp) {
DBG (15, "sane_get_devices: reading config file %s\n", CONFIG_FILE);
while (sanei_config_read (line, PATH_MAX, fp)) {
lp = line;
/* ignore comments */
if (*lp == '#')
continue;
/* skip empty lines */
if (*lp == 0)
continue;
if ((strncmp ("usb", lp, 3) == 0) && isspace (lp[3])) {
DBG (15, "sane_get_devices: looking for '%s'\n", lp);
sanei_usb_attach_matching_devices(lp, attach_one);
}
else if (!strncmp(lp, "has_cal_buffer", 14) && isspace (lp[14])) {
int buf;
lp += 14;
lp = sanei_config_skip_whitespace (lp);
buf = atoi (lp);
if(buf){
global_has_cal_buffer = 1;
}
else{
global_has_cal_buffer = 0;
}
DBG (15, "sane_get_devices: setting \"has_cal_buffer\" to %d\n",
global_has_cal_buffer);
}
else if (!strncmp(lp, "lines_per_block", 15) && isspace (lp[15])) {
int buf;
lp += 15;
lp = sanei_config_skip_whitespace (lp);
buf = atoi (lp);
if(buf < 1 || buf > 32){
DBG (15,
DBG (15,
"sane_get_devices: \"lines_per_block\"=%d\n out of range",
buf
);
@@ -398,42 +398,42 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
}
fclose (fp);
}
else {
DBG (5, "sane_get_devices: no config file '%s', using defaults\n",
CONFIG_FILE);
DBG (15, "sane_get_devices: looking for 'usb 0x08F0 0x0005'\n");
sanei_usb_attach_matching_devices("usb 0x08F0 0x0005", attach_one);
}
for (dev = scanner_devList; dev; dev=dev->next) {
DBG (15, "sane_get_devices: found scanner %s\n",dev->device_name);
num_devices++;
}
DBG (15, "sane_get_devices: found %d scanner(s)\n",num_devices);
sane_devArray = calloc (num_devices + 1, sizeof (SANE_Device*));
if (!sane_devArray)
return SANE_STATUS_NO_MEM;
for (dev = scanner_devList; dev; dev=dev->next) {
sane_devArray[i++] = (SANE_Device *)&dev->sane;
}
sane_devArray[i] = 0;
*device_list = sane_devArray;
DBG (10, "sane_get_devices: finish\n");
return SANE_STATUS_GOOD;
}
/* callback used by sane_get_devices
* build the scanner struct and link to global list
* unless struct is already loaded, then pretend
* build the scanner struct and link to global list
* unless struct is already loaded, then pretend
*/
static SANE_Status
attach_one (const char *device_name)
@@ -441,32 +441,32 @@ attach_one (const char *device_name)
struct scanner *s;
int ret, i;
SANE_Word vid, pid;
DBG (10, "attach_one: start '%s'\n", device_name);
for (s = scanner_devList; s; s = s->next) {
if (strcmp (s->sane.name, device_name) == 0) {
DBG (10, "attach_one: already attached!\n");
return SANE_STATUS_GOOD;
}
}
/* build a scanner struct to hold it */
DBG (15, "attach_one: init struct\n");
if ((s = calloc (sizeof (*s), 1)) == NULL)
return SANE_STATUS_NO_MEM;
/* copy the device name */
s->device_name = strdup (device_name);
if (!s->device_name){
free (s);
return SANE_STATUS_NO_MEM;
}
/* connect the fd */
DBG (15, "attach_one: connect fd\n");
s->fd = -1;
ret = connect_fd(s);
if(ret != SANE_STATUS_GOOD){
@@ -474,11 +474,11 @@ attach_one (const char *device_name)
free (s);
return ret;
}
/* clean up the scanner struct based on model */
/* this is the only piece of model specific code */
sanei_usb_get_vendor_product(s->fd,&vid,&pid);
if(vid == 0x08f0){
s->vendor_name = "CardScan";
if(pid == 0x0005){
@@ -507,10 +507,10 @@ attach_one (const char *device_name)
s->vendor_name = "Unknown";
s->product_name = "Unknown";
}
DBG (15, "attach_one: Found %s scanner %s at %s\n",
s->vendor_name, s->product_name, s->device_name);
/*copy config file settings*/
s->has_cal_buffer = global_has_cal_buffer;
s->lines_per_block = global_lines_per_block;
@@ -520,7 +520,7 @@ attach_one (const char *device_name)
/* try to get calibration */
if(s->has_cal_buffer){
DBG (15, "attach_one: scanner calibration\n");
ret = load_calibration(s);
if (ret != SANE_STATUS_GOOD) {
DBG (5, "sane_start: ERROR: cannot calibrate, incompatible?\n");
@@ -532,13 +532,13 @@ attach_one (const char *device_name)
else{
DBG (15, "attach_one: skipping calibration\n");
}
/* set SANE option 'values' to good defaults */
DBG (15, "attach_one: init options\n");
/* go ahead and setup the first opt, because
* frontend may call control_option on it
* before calling get_option_descriptor
/* go ahead and setup the first opt, because
* frontend may call control_option on it
* before calling get_option_descriptor
*/
memset (s->opt, 0, sizeof (s->opt));
for (i = 0; i < NUM_OPTIONS; ++i) {
@@ -546,29 +546,29 @@ attach_one (const char *device_name)
s->opt[i].size = sizeof (SANE_Word);
s->opt[i].cap = SANE_CAP_INACTIVE;
}
s->opt[OPT_NUM_OPTS].name = SANE_NAME_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
DBG (15, "attach_one: init settings\n");
/* we close the connection, so that another backend can talk to scanner */
disconnect_fd(s);
/* load info into sane_device struct */
s->sane.name = s->device_name;
s->sane.vendor = s->vendor_name;
s->sane.model = s->product_name;
s->sane.type = "scanner";
s->next = scanner_devList;
scanner_devList = s;
DBG (10, "attach_one: finish\n");
return SANE_STATUS_GOOD;
}
@@ -579,9 +579,9 @@ static SANE_Status
connect_fd (struct scanner *s)
{
SANE_Status ret;
DBG (10, "connect_fd: start\n");
if(s->fd > -1){
DBG (5, "connect_fd: already open\n");
ret = SANE_STATUS_GOOD;
@@ -590,13 +590,13 @@ connect_fd (struct scanner *s)
DBG (15, "connect_fd: opening USB device\n");
ret = sanei_usb_open (s->device_name, &(s->fd));
}
if(ret != SANE_STATUS_GOOD){
DBG (5, "connect_fd: could not open device: %d\n", ret);
}
DBG (10, "connect_fd: finish\n");
return ret;
}
@@ -608,25 +608,25 @@ load_calibration(struct scanner *s)
unsigned char * buf;
size_t bytes = HEADER_SIZE + CAL_COLOR_SIZE*2 + CAL_GRAY_SIZE*2;
int j;
DBG (10, "load_calibration: start\n");
buf = malloc(bytes);
if(!buf){
DBG(5, "load_calibration: not enough mem for buffer: %ld\n",(long)bytes);
return SANE_STATUS_NO_MEM;
}
ret = do_cmd(
s, 0,
cmd, sizeof(cmd),
NULL, 0,
buf, &bytes
);
if (ret == SANE_STATUS_GOOD) {
DBG(15, "load_calibration: got GOOD\n");
/*
* color cal data comes from scaner like:
* bbbbbbbBBBBBBBgggggggGGGGGGGrrrrrrrRRRRRRR
@@ -634,40 +634,40 @@ load_calibration(struct scanner *s)
* reorder the data into two buffers
* bbbbbbbgggggggrrrrrrr and BBBBBBBGGGGGGGRRRRRRR
*/
/*dark/light blue*/
memcpy(s->cal_color_b, buf+HEADER_SIZE, PIXELS_PER_LINE);
memcpy(s->cal_color_w,
buf+HEADER_SIZE+PIXELS_PER_LINE, PIXELS_PER_LINE);
/*dark/light green*/
memcpy(s->cal_color_b+PIXELS_PER_LINE,
buf+HEADER_SIZE+(PIXELS_PER_LINE*2), PIXELS_PER_LINE);
memcpy(s->cal_color_w+PIXELS_PER_LINE,
buf+HEADER_SIZE+(PIXELS_PER_LINE*3), PIXELS_PER_LINE);
/*dark/light red*/
memcpy(s->cal_color_b+(PIXELS_PER_LINE*2),
buf+HEADER_SIZE+(PIXELS_PER_LINE*4), PIXELS_PER_LINE);
memcpy(s->cal_color_w+(PIXELS_PER_LINE*2),
buf+HEADER_SIZE+(PIXELS_PER_LINE*5), PIXELS_PER_LINE);
/* then slide the light data down using the dark offset */
for(j=0;j<CAL_COLOR_SIZE;j++){
s->cal_color_w[j] -= s->cal_color_b[j];
}
/*dark/light gray*/
memcpy(s->cal_gray_b,
buf+HEADER_SIZE+(CAL_COLOR_SIZE*2), PIXELS_PER_LINE);
memcpy(s->cal_gray_w,
buf+HEADER_SIZE+(CAL_COLOR_SIZE*2)+PIXELS_PER_LINE, PIXELS_PER_LINE);
/* then slide the light data down using the dark offset */
for(j=0;j<CAL_GRAY_SIZE;j++){
s->cal_gray_w[j] -= s->cal_gray_b[j];
}
hexdump(35, "cal_color_b:", s->cal_color_b, CAL_COLOR_SIZE);
hexdump(35, "cal_color_w:", s->cal_color_w, CAL_COLOR_SIZE);
hexdump(35, "cal_gray_b:", s->cal_gray_b, CAL_GRAY_SIZE);
@@ -676,9 +676,9 @@ load_calibration(struct scanner *s)
else {
DBG(5, "load_calibration: error reading data block status = %d\n", ret);
}
DBG (10, "load_calibration: finish\n");
return ret;
}
@@ -697,9 +697,9 @@ sane_open (SANE_String_Const name, SANE_Handle * handle)
struct scanner *dev = NULL;
struct scanner *s = NULL;
SANE_Status ret;
DBG (10, "sane_open: start\n");
if(name[0] == 0){
if(scanner_devList){
DBG (15, "sane_open: no device requested, using first\n");
@@ -725,24 +725,24 @@ sane_open (SANE_String_Const name, SANE_Handle * handle)
}
}
}
if (!s) {
DBG (5, "sane_open: no device found\n");
return SANE_STATUS_INVAL;
}
DBG (15, "sane_open: device %s found\n", s->sane.name);
*handle = s;
/* connect the fd so we can talk to scanner */
ret = connect_fd(s);
if(ret != SANE_STATUS_GOOD){
return ret;
}
DBG (10, "sane_open: finish\n");
return SANE_STATUS_GOOD;
}
@@ -789,7 +789,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
s->mode_list[i++]=STRING_GRAYSCALE;
s->mode_list[i++]=STRING_COLOR;
s->mode_list[i]=NULL;
opt->name = SANE_NAME_SCAN_MODE;
opt->title = SANE_TITLE_SCAN_MODE;
opt->desc = SANE_DESC_SCAN_MODE;
@@ -805,7 +805,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
/**
* Gets or sets an option value.
*
*
* From the SANE spec:
* This function is used to set or inquire the current value of option
* number n of the device represented by handle h. The manner in which
@@ -816,7 +816,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
* area pointed to by v must be big enough to hold the entire option
* value (determined by member size in the corresponding option
* descriptor).
*
*
* The only exception to this rule is that when setting the value of a
* string option, the string pointed to by argument v may be shorter
* since the backend will stop reading the option value upon
@@ -902,7 +902,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
* below.
*/
switch (option) {
/* Mode Group */
case OPT_MODE:
if (!strcmp (val, STRING_GRAYSCALE)) {
@@ -939,7 +939,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
* completion of that request. Outside of that window, the returned
* values are best-effort estimates of what the parameters will be
* when sane_start() gets invoked.
*
*
* Calling this function before a scan has actually started allows,
* for example, to get an estimate of how big the scanned image will
* be. The parameters passed to this function are the handle h of the
@@ -986,38 +986,38 @@ sane_start (SANE_Handle handle)
{
struct scanner *s = handle;
SANE_Status ret;
DBG (10, "sane_start: start\n");
/* first page of batch */
if(s->started){
DBG(5,"sane_start: previous transfer not finished?");
sane_cancel((SANE_Handle)s);
return SANE_STATUS_CANCELLED;
}
/* set clean defaults */
s->started=1;
s->bytes_rx=0;
s->bytes_tx=0;
s->paperless_lines=0;
/* heat up the lamp */
/* heat up the lamp */
if(s->mode == MODE_COLOR){
ret = heat_lamp_color(s);
}
else{
ret = heat_lamp_gray(s);
}
if (ret != SANE_STATUS_GOOD) {
DBG (5, "sane_start: ERROR: failed to heat lamp\n");
sane_cancel((SANE_Handle)s);
return ret;
}
DBG (10, "sane_start: finish\n");
return SANE_STATUS_GOOD;
}
@@ -1031,9 +1031,9 @@ heat_lamp_gray(struct scanner *s)
size_t bytes = HEADER_SIZE + 1;
unsigned char * buf;
int i;
DBG (10, "heat_lamp_gray: start\n");
buf = malloc(bytes);
if(!buf){
DBG(5, "heat_lamp_gray: not enough mem for buffer: %lu\n",
@@ -1042,26 +1042,26 @@ heat_lamp_gray(struct scanner *s)
}
for(i=0;i<10;i++){
ret2 = do_cmd(
s, 0,
cmd, sizeof(cmd),
NULL, 0,
buf, &bytes
);
if (ret2 != SANE_STATUS_GOOD) {
DBG(5, "heat_lamp_gray: %d error\n",i);
ret = ret2;
break;
}
if(!buf[1]){
DBG(5, "heat_lamp_gray: %d got no docs\n",i);
ret = SANE_STATUS_NO_DOCS;
break;
}
DBG(15, "heat_lamp_gray: %d got: %d %d\n",i,
buf[HEADER_SIZE],s->cal_gray_b[0]);
@@ -1075,11 +1075,11 @@ heat_lamp_gray(struct scanner *s)
ret = SANE_STATUS_DEVICE_BUSY;
}
}
free(buf);
DBG (10, "heat_lamp_gray: finish %d\n",ret);
return ret;
}
@@ -1093,9 +1093,9 @@ heat_lamp_color(struct scanner *s)
size_t bytes = HEADER_SIZE + 3;
unsigned char * buf;
int i;
DBG (10, "heat_lamp_color: start\n");
buf = malloc(bytes);
if(!buf){
DBG(5, "heat_lamp_color: not enough mem for buffer: %lu\n",
@@ -1104,26 +1104,26 @@ heat_lamp_color(struct scanner *s)
}
for(i=0;i<10;i++){
ret2 = do_cmd(
s, 0,
cmd, sizeof(cmd),
NULL, 0,
buf, &bytes
);
if (ret2 != SANE_STATUS_GOOD) {
DBG(5, "heat_lamp_color: %d error\n",i);
ret = ret2;
break;
}
if(!buf[1]){
DBG(5, "heat_lamp_color: %d got no docs\n",i);
ret = SANE_STATUS_NO_DOCS;
break;
}
DBG(15, "heat_lamp_color: %d got: %d,%d,%d %d,%d,%d\n",i,
buf[HEADER_SIZE],buf[HEADER_SIZE+1],buf[HEADER_SIZE+2],
s->cal_color_b[0],s->cal_color_b[1],s->cal_color_b[2]);
@@ -1140,17 +1140,17 @@ heat_lamp_color(struct scanner *s)
ret = SANE_STATUS_DEVICE_BUSY;
}
}
free(buf);
DBG (10, "heat_lamp_color: finish %d\n",ret);
return ret;
}
/*
* Called by SANE to read data.
*
*
* From the SANE spec:
* This function is used to read image data from the device
* represented by handle h. Argument buf is a pointer to a memory
@@ -1158,7 +1158,7 @@ heat_lamp_color(struct scanner *s)
* returned is stored in *len. A backend must set this to zero when
* the call fails (i.e., when a status other than SANE_STATUS_GOOD is
* returned).
*
*
* When the call succeeds, the number of bytes returned can be
* anywhere in the range from 0 to maxlen bytes.
*/
@@ -1167,55 +1167,55 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len, SANE_Int * len
{
struct scanner *s = (struct scanner *) handle;
SANE_Status ret=SANE_STATUS_GOOD;
DBG (10, "sane_read: start\n");
*len = 0;
/* cancelled? */
if(!s->started){
DBG (5, "sane_read: call sane_start first\n");
return SANE_STATUS_CANCELLED;
}
/* have sent all of current buffer */
if(s->bytes_tx == s->bytes_rx){
/* at end of data, stop */
if(s->paperless_lines >= MAX_PAPERLESS_LINES){
DBG (15, "sane_read: returning eof\n");
power_down(s);
return SANE_STATUS_EOF;
}
/* more to get, reset and go */
s->bytes_tx = 0;
s->bytes_rx = 0;
if(s->mode == MODE_COLOR){
ret = read_from_scanner_color(s);
}
else{
ret = read_from_scanner_gray(s);
}
if(ret){
DBG(5,"sane_read: returning %d\n",ret);
return ret;
}
}
/* data in current buffer, send some of it */
*len = s->bytes_rx - s->bytes_tx;
if(*len > max_len){
*len = max_len;
}
memcpy(buf,s->buffer+s->bytes_tx,*len);
s->bytes_tx += *len;
DBG (10, "sane_read: %d,%d,%d finish\n", *len,s->bytes_rx,s->bytes_tx);
return ret;
}
@@ -1229,9 +1229,9 @@ read_from_scanner_gray(struct scanner *s)
size_t bytes = HEADER_SIZE + s->gray_block_size;
unsigned char * buf;
int i,j;
DBG (10, "read_from_scanner_gray: start\n");
cmd[4] = s->lines_per_block;
buf = malloc(bytes);
@@ -1240,14 +1240,14 @@ read_from_scanner_gray(struct scanner *s)
(long unsigned)bytes);
return SANE_STATUS_NO_MEM;
}
ret = do_cmd(
s, 0,
cmd, sizeof(cmd),
NULL, 0,
buf, &bytes
);
if (ret == SANE_STATUS_GOOD) {
DBG(15, "read_from_scanner_gray: got GOOD\n");
@@ -1255,19 +1255,19 @@ read_from_scanner_gray(struct scanner *s)
if(!buf[1]){
s->paperless_lines += s->lines_per_block;
}
s->bytes_rx = s->gray_block_size;
/*memcpy(s->buffer,buf+HEADER_SIZE,s->gray_block_size);*/
/* reorder the gray data into the struct's buffer */
for(i=0;i<s->gray_block_size;i+=PIXELS_PER_LINE){
for(j=0;j<PIXELS_PER_LINE;j++){
unsigned char byte = buf[ HEADER_SIZE + i + j ];
unsigned char bcal = s->cal_gray_b[j];
unsigned char wcal = s->cal_gray_w[j];
byte = (byte <= bcal)?0:(byte-bcal);
byte = (byte >= wcal)?255:(byte*255/wcal);
s->buffer[i+j] = byte;
@@ -1277,11 +1277,11 @@ read_from_scanner_gray(struct scanner *s)
else {
DBG(5, "read_from_scanner_gray: error reading status = %d\n", ret);
}
free(buf);
DBG (10, "read_from_scanner_gray: finish\n");
return ret;
}
@@ -1294,9 +1294,9 @@ read_from_scanner_color(struct scanner *s)
size_t bytes = HEADER_SIZE + s->color_block_size;
unsigned char * buf;
int i,j,k;
DBG (10, "read_from_scanner_color: start\n");
cmd[4] = s->lines_per_block;
buf = malloc(bytes);
@@ -1305,14 +1305,14 @@ read_from_scanner_color(struct scanner *s)
(long unsigned)bytes);
return SANE_STATUS_NO_MEM;
}
ret = do_cmd(
s, 0,
cmd, sizeof(cmd),
NULL, 0,
buf, &bytes
);
if (ret == SANE_STATUS_GOOD) {
DBG(15, "read_from_scanner_color: got GOOD\n");
@@ -1320,21 +1320,21 @@ read_from_scanner_color(struct scanner *s)
if(!buf[1]){
s->paperless_lines += s->lines_per_block;
}
s->bytes_rx = s->color_block_size;
/*memcpy(s->buffer,buf+HEADER_SIZE,s->color_block_size);*/
/* reorder the color data into the struct's buffer */
for(i=0;i<s->color_block_size;i+=PIXELS_PER_LINE*3){
for(j=0;j<PIXELS_PER_LINE;j++){
for(k=0;k<3;k++){
int offset = PIXELS_PER_LINE*(2-k) + j;
unsigned char byte = buf[ HEADER_SIZE + i + offset ];
unsigned char bcal = s->cal_color_b[offset];
unsigned char wcal = s->cal_color_w[offset];
byte = (byte <= bcal)?0:(byte-bcal);
byte = (byte >= wcal)?255:(byte*255/wcal);
s->buffer[i+j*3+k] = byte;
@@ -1345,11 +1345,11 @@ read_from_scanner_color(struct scanner *s)
else {
DBG(5, "read_from_scanner_color: error reading status = %d\n", ret);
}
free(buf);
DBG (10, "read_from_scanner_color: finish\n");
return ret;
}
@@ -1357,7 +1357,7 @@ read_from_scanner_color(struct scanner *s)
* @@ Section 4 - SANE cleanup functions
*/
/*
* Cancels a scan.
* Cancels a scan.
*
* From the SANE spec:
* This function is used to immediately or as quickly as possible
@@ -1393,7 +1393,7 @@ power_down(struct scanner *s)
unsigned char buf[6];
size_t bytes = sizeof(buf);
int i;
DBG (10, "power_down: start\n");
for(i=0;i<5;i++){
@@ -1413,9 +1413,9 @@ power_down(struct scanner *s)
unsigned char cmd[] = {0x35, 0x01, 0x00, 0xff};
unsigned char buf[5];
size_t bytes = sizeof(buf);
DBG (10, "power_down: start\n");
ret = do_cmd(
s, 0,
cmd, sizeof(cmd),
@@ -1423,15 +1423,15 @@ power_down(struct scanner *s)
buf, &bytes
);
#endif
DBG (10, "power_down: finish %d\n",ret);
return ret;
}
/*
* Ends use of the scanner.
*
*
* From the SANE spec:
* This function terminates the association between the device handle
* passed in argument h and the device it represents. If the device is
@@ -1467,7 +1467,7 @@ disconnect_fd (struct scanner *s)
/*
* Terminates the backend.
*
*
* From the SANE spec:
* This function must be called to terminate use of a backend. The
* function will first close all device handles that still might be
backend/cardscan.h
+6 -6
View File
@@ -1,12 +1,12 @@
#ifndef CARDSCAN_H
#define CARDSCAN_H
/*
/*
* Part of SANE - Scanner Access Now Easy.
* Please see opening comment in cardscan.c
*/
/* -------------------------------------------------------------------------
/* -------------------------------------------------------------------------
* This option list has to contain all options for all scanners supported by
* this driver. If a certain scanner cannot handle a certain option, there's
* still the possibility to say so, later.
@@ -48,10 +48,10 @@ struct scanner
/* --------------------------------------------------------------------- */
/* immutable values which are set during reading of config file. */
int has_cal_buffer;
int lines_per_block;
int color_block_size;
int gray_block_size;
int has_cal_buffer;
int lines_per_block;
int color_block_size;
int gray_block_size;
/* --------------------------------------------------------------------- */
/* changeable SANE_Option structs provide our interface to frontend. */
backend/coolscan-scsidef.h
+8 -8
View File
@@ -179,7 +179,7 @@ static scsiblk inquiry =
/* ==================================================================== */
/*
static unsigned char mode_selectC[] = {
MODE_SELECT, 0x10, 0x00, 0x00, 0x00, 0x00
MODE_SELECT, 0x10, 0x00, 0x00, 0x00, 0x00
static scsiblk mode_select = { mode_selectC,sizeof(mode_selectC) };
*/
@@ -518,7 +518,7 @@ static scsiblk window_descriptor_block =
/* LS-30 has different window-descriptor !
/* LS-30 has different window-descriptor !
*/
static unsigned char window_descriptor_blockC_LS30[] =
@@ -529,11 +529,11 @@ static unsigned char window_descriptor_blockC_LS30[] =
0x00, /* 0x00 */
/* Window Identifier */
#define WD_wid_0 0x00 /* Only one supported */
#define WD_wid_1 0x01
#define WD_wid_2 0x02
#define WD_wid_3 0x03
#define WD_wid_4 0x04
#define WD_wid_9 0x09
#define WD_wid_1 0x01
#define WD_wid_2 0x02
#define WD_wid_3 0x03
#define WD_wid_4 0x04
#define WD_wid_9 0x09
0x00, /* reserved, AUTO */
0x00, 0x00, /* 0x02 */
@@ -784,7 +784,7 @@ static unsigned char autofocusLS30C[] =
static unsigned char autofocuspos[] =
{
0x00,
0x00,
0x00, 0x00, 0x05, 0x10, /* x-position */
0x00, 0x00, 0x07, 0x9b, /* y-position */
};
backend/coolscan.c
+193 -193
View File
File diff suppressed because it is too large Load Diff
backend/coolscan.h
+10 -10
View File
@@ -110,7 +110,7 @@ typedef struct Image_Pos
{ int start; /* start position of image on film strip */
int end; /* end position of image on film strip */
int offset /* always 0 */;
int height; /* image height always 2591 */
int height; /* image height always 2591 */
} Image_Pos_t;
@@ -213,19 +213,19 @@ typedef struct Coolscan
int adbits; /* Number of A/D bits [8 or 12] */
int outputbits; /* Number of output image data bits [8] */
int maxres; /* Maximum resolution [2700] (dpi) */
int xmax; /* X-axis coordinate maximum value
(basic measurement unit when measurement
int xmax; /* X-axis coordinate maximum value
(basic measurement unit when measurement
unit divisor = 1200) [1151] */
int ymax; /* Y-axis coordinate maximum value
(basic measurement unit when measurement
int ymax; /* Y-axis coordinate maximum value
(basic measurement unit when measurement
unit divisor = 1200) [1727] */
int xmaxpix; /* X-axis coordinate maximum value (pixel
int xmaxpix; /* X-axis coordinate maximum value (pixel
address value) [2591] */
int ymaxpix; /* Y-axis coordinate maximum value (pixel
int ymaxpix; /* Y-axis coordinate maximum value (pixel
address value) [3887] */
int ycurrent; /* Current stage position (Y-axis direction
int ycurrent; /* Current stage position (Y-axis direction
pixel address) [0-7652] */
int currentfocus; /* Current focus position (focus direction
int currentfocus; /* Current focus position (focus direction
address) [0-200] */
int currentscanpitch; /* Current scan pitch [1-25] */
int autofeeder; /* Provision of auto feeder [Yes: 1, No: 0] */
@@ -276,7 +276,7 @@ typedef struct Coolscan
int analog_gamma_g; /* analog gamma green */
int analog_gamma_b; /* analog gamma blue */
/* Infrared correction values */
/* Infrared correction values */
int ired_red;
int ired_green;
int ired_blue;
backend/coolscan2.c
+1 -1
View File
@@ -36,7 +36,7 @@
If you submit changes to SANE to the maintainers to be included in
a subsequent release, you agree by submitting the changes that
those changes may be distributed with this exception intact.
If you write modifications of your own for SANE, it is your choice
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice.
backend/dc210.c
+10 -10
View File
@@ -1,7 +1,7 @@
/***************************************************************************
* SANE - Scanner Access Now Easy.
dc210.c
dc210.c
11/11/98
@@ -43,17 +43,17 @@
If you write modifications of your own for SANE, it is your choice
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice.
If you do not wish that, delete this exception notice.
***************************************************************************
This file implements a SANE backend for the Kodak DC-210
digital camera. THIS IS EXTREMELY ALPHA CODE! USE AT YOUR OWN RISK!!
digital camera. THIS IS EXTREMELY ALPHA CODE! USE AT YOUR OWN RISK!!
(feedback to: sane-dc210@interlinx.bc.ca
This backend is based somewhat on the dc25 backend included in this
package by Peter Fales
package by Peter Fales
***************************************************************************/
@@ -395,7 +395,7 @@ init_dc210 (DC210 * camera)
}
/* send a break to get it back to a known state */
/* Used to supply a non-zero argument to tcsendbreak(), TCSBRK,
/* Used to supply a non-zero argument to tcsendbreak(), TCSBRK,
* and TCSBRKP, but that is system dependent. e.g. on irix a non-zero
* value does a drain instead of a break. A zero value is universally
* used to send a break.
@@ -423,8 +423,8 @@ init_dc210 (DC210 * camera)
if (send_pck (camera->fd, init_pck) == -1)
{
/*
* The camera always powers up at 9600, so we try
* that first. However, it may be already set to
* The camera always powers up at 9600, so we try
* that first. However, it may be already set to
* a different speed. Try the entries in the table:
*/
@@ -455,7 +455,7 @@ init_dc210 (DC210 * camera)
}
}
/*
Set speed to requested speed.
Set speed to requested speed.
*/
cfsetospeed (&tty_new, Camera.baud);
cfsetispeed (&tty_new, Camera.baud);
@@ -954,7 +954,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
if (dc210_opt_thumbnails)
{
/*
/*
* DC210 thumbnail are 96x72x8x3
*/
parms.bytes_per_line = 96 * 3;
@@ -1190,7 +1190,7 @@ sane_start (SANE_Handle handle)
{
/*
* Don't allow picture unless there is room in the
* Don't allow picture unless there is room in the
* camera.
*/
if (Camera.pic_left == 0)
backend/dc210.conf.in
+1 -1
View File
@@ -18,7 +18,7 @@ port=/dev/ttyS0
## This works for most UNIX's
baud=38400
# Prints some extra information during the init phase. This can be
# handy, but note that printing anything to stderr breaks the saned
# handy, but note that printing anything to stderr breaks the saned
# network scanning.
#dumpinquiry
# How many usec (1,000,000ths of a) between writing the command and reading the
backend/dc210.h
+4 -4
View File
@@ -1,7 +1,7 @@
/***************************************************************************
* SANE - Scanner Access Now Easy.
dc210.c
dc210.c
11/11/98
@@ -43,17 +43,17 @@
If you write modifications of your own for SANE, it is your choice
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice.
If you do not wish that, delete this exception notice.
***************************************************************************
This file implements a SANE backend for the Kodak DC-210
digital camera. THIS IS EXTREMELY ALPHA CODE! USE AT YOUR OWN RISK!!
digital camera. THIS IS EXTREMELY ALPHA CODE! USE AT YOUR OWN RISK!!
(feedback to: sane-dc210@interlinx.bc.ca
This backend is based somewhat on the dc25 backend included in this
package by Peter Fales
package by Peter Fales
***************************************************************************/
backend/dc240.c
+19 -19
View File
@@ -1,13 +1,13 @@
/***************************************************************************
* _S_A_N_E - Scanner Access Now Easy.
dc240.c
dc240.c
03/12/01 - Peter Fales
Based on the dc210 driver, (C) 1998 Brian J. Murrell (which is
based on dc25 driver (C) 1998 by Peter Fales)
This file (C) 2001 by Peter Fales
This file is part of the SANE package.
@@ -46,12 +46,12 @@
If you write modifications of your own for SANE, it is your choice
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice.
If you do not wish that, delete this exception notice.
***************************************************************************
This file implements a SANE backend for the Kodak DC-240
digital camera. THIS IS EXTREMELY ALPHA CODE! USE AT YOUR OWN RISK!!
digital camera. THIS IS EXTREMELY ALPHA CODE! USE AT YOUR OWN RISK!!
(feedback to: dc240-devel@fales-lorenz.net)
@@ -440,7 +440,7 @@ init_dc240 (DC240 * camera)
}
/* send a break to get it back to a known state */
/* Used to supply a non-zero argument to tcsendbreak(), TCSBRK,
/* Used to supply a non-zero argument to tcsendbreak(), TCSBRK,
* and TCSBRKP, but that is system dependent. e.g. on irix a non-zero
* value does a drain instead of a break. A zero value is universally
* used to send a break.
@@ -465,7 +465,7 @@ init_dc240 (DC240 * camera)
sleep (1);
#endif
/* We seem to get some garbage following the break, so
/* We seem to get some garbage following the break, so
* read anything pending */
n = read (camera->fd, buf, 5);
@@ -476,8 +476,8 @@ init_dc240 (DC240 * camera)
if (send_pck (camera->fd, init_pck) == -1)
{
/*
* The camera always powers up at 9600, so we try
* that first. However, it may be already set to
* The camera always powers up at 9600, so we try
* that first. However, it may be already set to
* a different speed. Try the entries in the table:
*/
@@ -491,7 +491,7 @@ init_dc240 (DC240 * camera)
buf[1], buf[2], buf[3], buf[4]);
/*
Set speed to requested speed.
Set speed to requested speed.
*/
cfsetospeed (&tty_new, Camera.baud);
cfsetispeed (&tty_new, Camera.baud);
@@ -597,7 +597,7 @@ get_info (DC240 * camera)
n = read_dir ("\\PCCARD\\DCIM\\*.*");
/* If we've already got a folder_list, free it up before starting
* the new one
* the new one
*/
if (folder_list != NULL)
{
@@ -1083,8 +1083,8 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
myinfo |= SANE_INFO_RELOAD_PARAMS;
/* get the image's resolution, unless the camera has no
* pictures yet
/* get the image's resolution, unless the camera has no
* pictures yet
*/
if (Camera.pic_taken != 0)
{
@@ -1367,7 +1367,7 @@ sane_start (SANE_Handle handle)
if (dc240_opt_snap)
{
/*
* Don't allow picture unless there is room in the
* Don't allow picture unless there is room in the
* camera.
*/
if (Camera.pic_left == 0)
@@ -1719,7 +1719,7 @@ get_picture_info (PictureInfo * pic, SANE_Int p)
read_info (e->name);
/* Validate picture info
/* Validate picture info
* byte 0 - 1 == picture info
* byte 1 - 5 == DC240 Camera
* byte 2 - 3 == JFIF file
@@ -1736,7 +1736,7 @@ get_picture_info (PictureInfo * pic, SANE_Int p)
pic->low_res = info_buf[3] == 0 ? SANE_TRUE : SANE_FALSE;
/*
/*
* byte 12 - Year MSB
* byte 13 - Year LSB
* byte 14 - Month
@@ -1991,8 +1991,8 @@ read_info (SANE_String fname)
/*
* send_data - Send a data block - assumes all data blocks to camera
* are 60 bytes long
* send_data - Send a data block - assumes all data blocks to camera
* are 60 bytes long
*/
static SANE_Int
@@ -2090,7 +2090,7 @@ dir_insert (struct cam_dirent *entry)
}
/*
* dir_delete - Delete a directory entry from the linked list of file
* dir_delete - Delete a directory entry from the linked list of file
* names
*/
static SANE_Int
@@ -2123,7 +2123,7 @@ dir_delete (SANE_String fname)
}
/*
* set_res - set picture size depending on resolution settings
* set_res - set picture size depending on resolution settings
*/
static void
set_res (SANE_Int lowres)
backend/dc240.conf.in
+1 -1
View File
@@ -18,7 +18,7 @@ port=/dev/ttyS0
## This works for most UNIX's
baud=38400
# Prints some extra information during the init phase. This can be
# handy, but note that printing anything to stderr breaks the saned
# handy, but note that printing anything to stderr breaks the saned
# network scanning.
#dumpinquiry
# How many usec (1,000,000ths of a) between writing the command and reading the
backend/dc240.h
+8 -8
View File
@@ -46,12 +46,12 @@
If you write modifications of your own for SANE, it is your choice
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice.
If you do not wish that, delete this exception notice.
***************************************************************************
This file implements a SANE backend for the Kodak DC-240
digital camera. THIS IS EXTREMELY ALPHA CODE! USE AT YOUR OWN RISK!!
digital camera. THIS IS EXTREMELY ALPHA CODE! USE AT YOUR OWN RISK!!
(feedback to: dc240-devel@fales-lorenz.net)
@@ -143,16 +143,16 @@ static SANE_Int get_info (DC240 *);
* Resolution: 0x00 = low, 0x01 = high
*/
#define THUMBS_PCK {0x93, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x1A}
/*
*
/*
*
*/
#define PICS_PCK {0x9A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A}
/*
*
/*
*
*/
#define PICS_INFO_PCK {0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A}
/*
*
/*
*
*/
#define OPEN_CARD_PCK {0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A}
#define READ_DIR_PCK {0x99, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A}
backend/dc25.c
+28 -28
View File
@@ -1,7 +1,7 @@
/***************************************************************************
* SANE - Scanner Access Now Easy.
dc25.c
dc25.c
$Id$
@@ -43,13 +43,13 @@
If you write modifications of your own for SANE, it is your choice
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice.
If you do not wish that, delete this exception notice.
***************************************************************************
This file implements a SANE backend for the Kodak DC-25 (and
This file implements a SANE backend for the Kodak DC-25 (and
probably the DC-20) digital cameras. THIS IS EXTREMELY ALPHA CODE!
USE AT YOUR OWN RISK!!
USE AT YOUR OWN RISK!!
(feedback to: dc25-devel@fales-lorenz.net)
@@ -73,7 +73,7 @@
* conversion routine written by YOSHIDA Hideki <hideki@yk.rim.or.jp>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
* it under the terms of the GNU General Public License as published
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
@@ -352,9 +352,9 @@ static SANE_Parameters parms = {
static unsigned char init_pck[] = INIT_PCK;
/*
* List of speeds to try to establish connection with the camera.
* List of speeds to try to establish connection with the camera.
* Check 9600 first, as it's the speed the camera comes up in, then
* 115200, as that is the one most likely to be configured from a
* 115200, as that is the one most likely to be configured from a
* previous run
*/
static struct pkt_speed speeds[] = { {B9600, {0x96, 0x00}},
@@ -468,8 +468,8 @@ init_dc20 (char *device, speed_t speed)
if (send_pck (tfd, init_pck) == -1)
{
/*
* The camera always powers up at 9600, so we try
* that first. However, it may be already set to
* The camera always powers up at 9600, so we try
* that first. However, it may be already set to
* a different speed. Try the entries in the table:
*/
@@ -594,7 +594,7 @@ get_info (int fd)
{
/* Not sure where the previous line came from. All the
* information I have says that even on the DC20 the number of
* standard res pics left is in byte 23 and the number of high res
* standard res pics left is in byte 23 and the number of high res
* pics left is in byte 21. It seems to me that the conservative
* approach is to report the number of high res pics left.
*/
@@ -1114,7 +1114,7 @@ if (verbose) printf ("%s: determine_limits: low_i = %d, high_i = %d\n", __progna
/*
* The original dc20ctrl program used a default gamma of 0.35, but I thougt
* 0.45 looks better. In addition, since xscanimage seems to always force
* 0.45 looks better. In addition, since xscanimage seems to always force
* a resolution of 0.1, I multiply everything by 10 and make the default
* 4.5.
*/
@@ -1689,8 +1689,8 @@ shoot (int fd)
cfsetispeed (&tty_temp, B9600);
cfsetospeed (&tty_temp, B9600);
/*
* Apparently there is a bug in the DC20 where the response to
/*
* Apparently there is a bug in the DC20 where the response to
* the shoot request is always at 9600. The DC25 does not have
* this bug, so we skip this block.
*/
@@ -1728,7 +1728,7 @@ shoot (int fd)
{
if (CameraInfo.model == 0x25)
{
/*
/*
* If we don't put this in, the next read will time out
* and return failure. Does the DC-20 need it too?
*/
@@ -1771,7 +1771,7 @@ erase (int fd)
* This block may really apply to the DC20 also, but since I
* don't have one, it's hard to say for sure. On the DC25, erase
* takes long enought that the read may timeout without returning
* any data before the erase is complete. We let this happen
* any data before the erase is complete. We let this happen
* up to 4 times, then give up.
*/
while (count < 4)
@@ -2121,7 +2121,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
if (dc25_opt_thumbnails)
{
/*
/*
* DC20 thumbnail are 80x60 grayscale, DC25
* thumbnails are color.
*/
@@ -2200,7 +2200,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
/*
* erase and erase_one are mutually exclusive. If
* this one is turned on, the other must be off
* this one is turned on, the other must be off
*/
if (dc25_opt_erase && dc25_opt_erase_one)
{
@@ -2214,7 +2214,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
/*
* erase and erase_one are mutually exclusive. If
* this one is turned on, the other must be off
* this one is turned on, the other must be off
*/
if (dc25_opt_erase_one && dc25_opt_erase)
{
@@ -2350,7 +2350,7 @@ sane_start (SANE_Handle handle)
{
/*
* Don't allow picture unless there is room in the
* Don't allow picture unless there is room in the
* camera.
*/
if (CameraInfo.pic_left == 0)
@@ -2359,7 +2359,7 @@ sane_start (SANE_Handle handle)
return SANE_STATUS_INVAL;
}
/*
/*
* DC-20 can only change resolution when camer is empty.
* DC-25 can do it any time.
*/
@@ -2403,7 +2403,7 @@ sane_start (SANE_Handle handle)
/*
* For thumbnails, we can do things right where we
* start the download, and grab the first block
* start the download, and grab the first block
* from the camera. The reamining blocks will be
* fetched as necessary by sane_read().
*/
@@ -2421,7 +2421,7 @@ sane_start (SANE_Handle handle)
return SANE_STATUS_INVAL;
}
/*
/*
* DC20 thumbnail are 80x60 grayscale, DC25
* thumbnails are color.
*/
@@ -2439,10 +2439,10 @@ sane_start (SANE_Handle handle)
{
/*
* We do something a little messy, and violates the SANE
* philosophy. However, since it is fairly tricky to
* philosophy. However, since it is fairly tricky to
* convert the DC2x "comet" files on the fly, we read in
* the entire data stream in sane_open(), and use convert_pic
* to convert it to an in-memory pixpmap. Then when
* to convert it to an in-memory pixpmap. Then when
* sane_read() is called, we fill the requests from
* memory. A good project for me (or some kind volunteer)
* would be to rewrite this and move the actual download
@@ -2450,7 +2450,7 @@ sane_start (SANE_Handle handle)
* this way is that the data comes down pretty fast, and
* it helps to dedicate the processor to this task. We
* might get serial port overruns if we try to do other
* things at the same time.
* things at the same time.
*
* Also, as a side note, I was constantly getting serial
* port overruns on a 90MHz pentium until I used hdparm
@@ -2634,7 +2634,7 @@ sane_read (SANE_Handle __sane_unused__ handle, SANE_Byte * data,
int i;
int filesize = parms.bytes_per_line * parms.lines;
/*
/*
* If outbytes is zero, then this is the first time
* we've been called, so update the contrast table.
* The formula is something I came up with that has the
@@ -2642,10 +2642,10 @@ sane_read (SANE_Handle __sane_unused__ handle, SANE_Byte * data,
* 1) It's a smooth curve that provides the effect I wanted
* (bright pixels are made brighter, dim pixels are made
* dimmer)
* 2) The contrast parameter can be adjusted to provide
* 2) The contrast parameter can be adjusted to provide
* different amounts of contrast.
* 3) A parameter of 1.0 can be used to pass the data
* through unchanged (but values around 1.75 look
* through unchanged (but values around 1.75 look
* a lot better
*/
if (outbytes == 0)
backend/dc25.conf.in
+1 -1
View File
@@ -18,6 +18,6 @@ port=/dev/ttyS0
## This works for most UNIX's
baud=38400
# Prints some extra information during the init phase. This can be
# handy, but note that printing anything to stderr breaks the saned
# handy, but note that printing anything to stderr breaks the saned
# network scanning.
#dumpinquiry
backend/dc25.h
+6 -6
View File
@@ -43,13 +43,13 @@
If you write modifications of your own for SANE, it is your choice
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice.
If you do not wish that, delete this exception notice.
***************************************************************************
This file implements a SANE backend for the Kodak DC-25 (and
This file implements a SANE backend for the Kodak DC-25 (and
probably the DC-20) digital cameras. THIS IS EXTREMELY ALPHA CODE!
USE AT YOUR OWN RISK!!
USE AT YOUR OWN RISK!!
(feedback to: dc25-devel@fales-lorenz.net)
@@ -73,7 +73,7 @@
* conversion routine written by YOSHIDA Hideki <hideki@yk.rim.or.jp>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
* it under the terms of the GNU General Public License as published
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
@@ -97,7 +97,7 @@
#include <string.h>
#ifndef TRUE
#define TRUE (1==1)
#define TRUE (1==1)
#endif
#ifndef FALSE
@@ -255,7 +255,7 @@ static int read_data (int fd, unsigned char *buf, int sz);
static int end_of_data (int fd);
static int set_pixel_rgb (struct pixmap *, int, int, unsigned char, unsigned char, unsigned char);
static int set_pixel_rgb (struct pixmap *, int, int, unsigned char, unsigned char, unsigned char);
static struct pixmap *alloc_pixmap (int x, int y, int d);
backend/dell1600n_net.c
+23 -23
View File
@@ -1,47 +1,47 @@
/*
sane - Scanner Access Now Easy.
Copyright (C) 2006 Jon Chambers <jon@jon.demon.co.uk>
This file is part of the SANE package.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston,
MA 02111-1307, USA.
As a special exception, the authors of SANE give permission for
additional uses of the libraries contained in this release of SANE.
The exception is that, if you link a SANE library with other files
to produce an executable, this does not by itself cause the
resulting executable to be covered by the GNU General Public
License. Your use of that executable is in no way restricted on
account of linking the SANE library code into it.
This exception does not, however, invalidate any other reasons why
the executable file might be covered by the GNU General Public
License.
If you submit changes to SANE to the maintainers to be included in
a subsequent release, you agree by submitting the changes that
those changes may be distributed with this exception intact.
If you write modifications of your own for SANE, it is your choice
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice.
Dell 1600n network scan driver for SANE.
To debug:
SANE_DEBUG_DELL1600N_NET=255 scanimage --verbose 2>scan.errs 1>scan.png
*/
@@ -136,8 +136,8 @@ struct ScannerState
unsigned int m_currentPageBytes;/* number of bytes of current page read (host byte order) */
};
/* state data for a single page
NOTE: all ints are in host byte order
/* state data for a single page
NOTE: all ints are in host byte order
*/
struct PageInfo
{
@@ -199,7 +199,7 @@ static void FinalisePacket (struct ComBuf *pBuf);
static int MessageIsComplete (unsigned char *pData, size_t size);
/* process a registration broadcast response
\return DeviceRecord pointer on success (caller frees), NULL on failure
\return DeviceRecord pointer on success (caller frees), NULL on failure
*/
static struct DeviceRecord *ProcessFindResponse (unsigned char *pData, size_t size);
@@ -638,7 +638,7 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
height = pageInfo.m_height;
imageSize = width * height * 3;
DBG( 5, "sane_get_parameters: bytes remaining on this page: %d, num pages: %d, size: %dx%d\n",
DBG( 5, "sane_get_parameters: bytes remaining on this page: %d, num pages: %d, size: %dx%d\n",
pageInfo.m_bytesRemaining,
gOpenScanners[iHandle]->m_numPages,
width,
@@ -781,7 +781,7 @@ sane_start (SANE_Handle handle)
cleanup:
FreeComBuf (&buf);
return status;
} /* sane_start */
@@ -805,7 +805,7 @@ sane_read (SANE_Handle handle, SANE_Byte * data,
return SANE_STATUS_INVAL;
/* check for end of data (no further pages) */
if ( ( ! gOpenScanners[iHandle]->m_imageData.m_used )
if ( ( ! gOpenScanners[iHandle]->m_imageData.m_used )
|| ( ! gOpenScanners[iHandle]->m_numPages ) )
{
/* remove empty page if there are no more cached pages */
@@ -845,7 +845,7 @@ sane_read (SANE_Handle handle, SANE_Byte * data,
DBG (5,
"sane_read: sending %d bytes, image total %d, %d page bytes remaining, %lu total remaining, image: %dx%d\n",
dataSize, gOpenScanners[iHandle]->m_bytesRead, pageInfo.m_bytesRemaining ,
(unsigned long)(gOpenScanners[iHandle]->m_imageData.m_used - dataSize),
(unsigned long)(gOpenScanners[iHandle]->m_imageData.m_used - dataSize),
pageInfo.m_width,
pageInfo.m_height);
@@ -1037,7 +1037,7 @@ FreeComBuf (struct ComBuf *pBuf)
/* add data to a ComBuf struct
\return 0 on success, >0 on failure
\note If pData is NULL then buffer size will be increased but no copying will take place
\note In case of failure pBuf will be released using FreeComBuf
\note In case of failure pBuf will be released using FreeComBuf
*/
int
AppendToComBuf (struct ComBuf *pBuf, const unsigned char *pData,
@@ -1178,7 +1178,7 @@ MessageIsComplete (unsigned char *pData, size_t size)
/***********************************************************/
/* process a registration broadcast response
\return struct DeviceRecord pointer on success (caller frees), NULL on failure
\return struct DeviceRecord pointer on success (caller frees), NULL on failure
*/
struct DeviceRecord *
ProcessFindResponse (unsigned char *pData, size_t size)
@@ -1730,7 +1730,7 @@ ProcessTcpResponse (struct ScannerState *pState, struct ComBuf *pTcpBuf)
} /* if */
} /* while */
/* process page data if required */
/* process page data if required */
if ( bProcessImage ) errorCheck |= ProcessPageData (pState);
cleanup:
@@ -1824,10 +1824,10 @@ ProcessPageData (struct ScannerState *pState)
jpegCinfo.m_cinfo.src = &jpegSrcMgr;
jpegCinfo.m_bytesRemaining = pState->m_buf.m_used;
jpegCinfo.m_pData = pState->m_buf.m_pBuf;
jpeg_read_header (&jpegCinfo.m_cinfo, TRUE);
jpeg_start_decompress (&jpegCinfo.m_cinfo);
/* allocate space for a single scanline */
scanLineSize = jpegCinfo.m_cinfo.output_width
* jpegCinfo.m_cinfo.output_components;
backend/dll.c
+8 -8
View File
@@ -42,7 +42,7 @@
allows managing an arbitrary number of SANE backends by using
dynamic linking to load backends on demand. */
/* Please increase version number with every change
/* Please increase version number with every change
(don't forget to update dll.desc) */
#define DLL_VERSION "1.0.13"
@@ -353,7 +353,7 @@ load (struct backend *be)
image_id id = -1;
int i, w;
directory_which which[3] = { B_USER_ADDONS_DIRECTORY, B_COMMON_ADDONS_DIRECTORY, B_BEOS_ADDONS_DIRECTORY };
/* look for config files in SANE/conf */
for (w = 0; (w < 3) && (id < 0) && (find_directory(which[w],0,true,path,PATH_MAX) == 0); w++)
{
@@ -373,7 +373,7 @@ load (struct backend *be)
continue; /* try next path */
}
be->handle=(void *)id;
for (i = 0; i < NUM_OPS; ++i)
{
void *(*op) ();
@@ -492,7 +492,7 @@ load (struct backend *be)
break;
DBG (4, "load: couldn't open `%s' (%s)\n", libname, strerror (errno));
#ifdef ALT_POSTFIX
#ifdef ALT_POSTFIX
/* Some platforms have two ways of storing their libraries, try both
postfixes */
snprintf (libname, sizeof (libname), "%s/" PREFIX "%s" ALT_POSTFIX,
@@ -882,7 +882,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
char path[1024];
directory_which which[3] = { B_USER_ADDONS_DIRECTORY, B_COMMON_ADDONS_DIRECTORY, B_BEOS_ADDONS_DIRECTORY };
int i;
#endif
#endif
DBG_INIT ();
@@ -934,7 +934,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
}
fclose (fp);
#else
#else
/* no ugly config files, just get scanners from their ~/config/add-ons/SANE */
/* look for drivers */
for (i = 0; i < 3; i++)
@@ -943,13 +943,13 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
continue;
strcat(path,"/SANE/");
dir=opendir(path);
if(!dir) continue;
if(!dir) continue;
while((dirent=readdir(dir)))
{
if((strcmp(dirent->d_name,".")==0) || (strcmp(dirent->d_name,"..")==0)) continue;
if((strcmp(dirent->d_name,"dll")==0)) continue;
add_backend(dirent->d_name,0);
add_backend(dirent->d_name,0);
}
closedir(dir);
}
backend/dmc.c
+11 -11
View File
@@ -1,6 +1,6 @@
/* sane - Scanner Access Now Easy.
Copyright (C) 1998 David F. Skoll
Heavily based on "hp.c" driver for HP Scanners, by
Heavily based on "hp.c" driver for HP Scanners, by
David Mosberger-Tang.
This file is part of the SANE package.
@@ -425,7 +425,7 @@ DMCInitOptions(DMC_Camera *c)
c->opt[OPT_TL_X].constraint_type = SANE_CONSTRAINT_RANGE;
c->opt[OPT_TL_X].constraint.range = &c->tl_x_range;
c->val[OPT_TL_X].w = c->tl_x_range.min;
/* top-left y */
c->opt[OPT_TL_Y].name = SANE_NAME_SCAN_TL_Y;
c->opt[OPT_TL_Y].title = SANE_TITLE_SCAN_TL_Y;
@@ -435,7 +435,7 @@ DMCInitOptions(DMC_Camera *c)
c->opt[OPT_TL_Y].constraint_type = SANE_CONSTRAINT_RANGE;
c->opt[OPT_TL_Y].constraint.range = &c->tl_y_range;
c->val[OPT_TL_Y].w = c->tl_y_range.min;
/* bottom-right x */
c->opt[OPT_BR_X].name = SANE_NAME_SCAN_BR_X;
c->opt[OPT_BR_X].title = SANE_TITLE_SCAN_BR_X;
@@ -445,7 +445,7 @@ DMCInitOptions(DMC_Camera *c)
c->opt[OPT_BR_X].constraint_type = SANE_CONSTRAINT_RANGE;
c->opt[OPT_BR_X].constraint.range = &c->br_x_range;
c->val[OPT_BR_X].w = c->br_x_range.min;
/* bottom-right y */
c->opt[OPT_BR_Y].name = SANE_NAME_SCAN_BR_Y;
c->opt[OPT_BR_Y].title = SANE_TITLE_SCAN_BR_Y;
@@ -485,7 +485,7 @@ DMCInitOptions(DMC_Camera *c)
c->opt[OPT_SHUTTER_SPEED].constraint_type = SANE_CONSTRAINT_RANGE;
c->opt[OPT_SHUTTER_SPEED].constraint.range = &c->hw->shutterSpeedRange;
c->val[OPT_SHUTTER_SPEED].w = c->hw->shutterSpeed;
c->opt[OPT_WHITE_BALANCE].name = "whitebalance";
c->opt[OPT_WHITE_BALANCE].title = "White Balance";
c->opt[OPT_WHITE_BALANCE].desc = "Selects white balance";
@@ -618,7 +618,7 @@ DMCSetASA(int fd, unsigned int asa)
if (i > ASA_100+1) return SANE_STATUS_INVAL;
status = DMCRead(fd, 0x87, 0x4, exposureCalculationResults,
status = DMCRead(fd, 0x87, 0x4, exposureCalculationResults,
sizeof(exposureCalculationResults), &len);
if (status != SANE_STATUS_GOOD) return status;
if (len < sizeof(exposureCalculationResults)) return SANE_STATUS_IO_ERROR;
@@ -647,7 +647,7 @@ DMCSetWhiteBalance(int fd, int mode)
size_t len;
DBG(3, "DMCSetWhiteBalance: %d\n", mode);
status = DMCRead(fd, 0x82, 0x0, userInterfaceSettings,
status = DMCRead(fd, 0x82, 0x0, userInterfaceSettings,
sizeof(userInterfaceSettings), &len);
if (status != SANE_STATUS_GOOD) return status;
if (len < sizeof(userInterfaceSettings)) return SANE_STATUS_IO_ERROR;
@@ -749,7 +749,7 @@ DMCReadTwoSuperResolutionLines(DMC_Camera *c, SANE_Byte *buf, int lastLine)
greenCoeff = ADVANCE_COEFF(greenCoeff);
blueCoeff = ADVANCE_COEFF(blueCoeff);
}
/* Do the next super-resolution line and interpolate vertically */
if (lastLine) {
memcpy(buf+BYTES_PER_RAW_LINE*3, buf, BYTES_PER_RAW_LINE*3);
@@ -868,7 +868,7 @@ sane_exit(void)
free(dev);
dev = next;
}
if (devlist)
free (devlist);
}
@@ -1103,7 +1103,7 @@ sane_control_option(SANE_Handle handle, SANE_Int option,
if (c->val[OPT_SHUTTER_SPEED].w != * (SANE_Int *) val) {
if (info) *info |= SANE_INFO_INEXACT;
}
return SANE_STATUS_GOOD;
default:
@@ -1328,7 +1328,7 @@ sane_read(SANE_Handle handle, SANE_Byte *buf, SANE_Int max_len, SANE_Int *len)
*len = max_len;
return SANE_STATUS_GOOD;
}
if (c->imageMode == IMAGE_MFI || c->imageMode == IMAGE_RAW) {
/* We have to read complete rows... */
max_len = (max_len / c->params.bytes_per_line) * c->params.bytes_per_line;
backend/epjitsu.c
+214 -214
View File
File diff suppressed because it is too large Load Diff
backend/epjitsu.conf.in
+1 -1
View File
@@ -12,7 +12,7 @@
# extracted from the Fujitsu Windows driver. Presumably the Mac versions
# contain the firmware as well, but the author has no access such a machine.
# Firmware is installed in several different locations by the fujitsu software,
# Firmware is installed in several different locations by the fujitsu software,
# using the windows 'search' feature to look for '*.nal' is the easiest way to
# find them. They should be ~65K, and have the scanner's name as part of the
# file name. They are often inside a .cab file.
backend/epjitsu.h
+3 -3
View File
@@ -1,12 +1,12 @@
#ifndef EPJITSU_H
#define EPJITSU_H
/*
/*
* Part of SANE - Scanner Access Now Easy.
* Please see opening comment in epjitsu.c
*/
/* -------------------------------------------------------------------------
/* -------------------------------------------------------------------------
* This option list has to contain all options for all scanners supported by
* this driver. If a certain scanner cannot handle a certain option, there's
* still the possibility to say so, later.
@@ -197,7 +197,7 @@ struct scanner
unsigned char * setWindowScan; /* sent before scan */
size_t setWindowScanLen;
/* --------------------------------------------------------------------- */
/* values which are set by scanning functions to keep track of pages, etc */
int started;
backend/epson.c
+190 -190
View File
@@ -1,4 +1,4 @@
/*
/*
epson.c - SANE library for Epson flatbed scanners.
Based on Kazuhiro Sasayama previous
@@ -63,7 +63,7 @@
2006-08-21 Fix buffer overflow error (submitted by Johannes Meixner)
2006-06-11 Applied patch from Henning. Fixed a number of compiler warnings
2006-03-12 Added support for perfetion 4990 photo 4800 dpi
2005-01-09 "flaming hack to get USB scanners working without timeouts under linux"
2005-01-09 "flaming hack to get USB scanners working without timeouts under linux"
submitted by "Steve" (in comment to bug #300830)
2004-12-18 Added USB IDs for CX-4600 and CX-3650
2004-10-16 Added USB ID for Expression 10000XL
@@ -78,7 +78,7 @@
Added EPSON Kowa copyright message
2003-08-15 Added support for GT-30000, with support for the ADF in simplex mode
Borrowed some code from the EPSON Kowa IScan version of the backend
Use sanei_scsi_cmd2() to send commands. This makes this backend
Use sanei_scsi_cmd2() to send commands. This makes this backend
useable for SBP-2 under FreeBSD
2003-05-11 Initialize OPT_LIMIT_RESOLUTION before first call to filter_resolution_list()
Fix memory problem in get_identity_information(). Both problems were
@@ -88,14 +88,14 @@
2003-02-15 Move sanei_usb_init() to sane_init(). Thanks to Ron Cemer
for providing the patch.
2003-02-15 Fix problem with "usb <vendor> <product> syntax in config file
2002-12-28 Added advanced option to display only short resolution list for
2002-12-28 Added advanced option to display only short resolution list for
displays that can not show the complete list.
2002-11-23 Fixed problem with dropout color.
2002-11-03 Full libusb support.
2002-10-05 Fixed problem with incorrect response to sane_get_parameters()
in certain situations.
2002-09-01 USB scanners are now using libsane-usb funtions
2002-08-17 Fixed typo in variable name.
2002-08-17 Fixed typo in variable name.
Fixed IEEE-1394 problem with Perfection-2450.
Fixed problem with older B3 level SCSI scanners that do
not support the extended status request.
@@ -104,12 +104,12 @@
2002-04-13 Check if scanner needs to be opened for the reset call.
(Thanks to Thomas Wenrich for pointing this out)
Added product IDs for Perfection 1650 and 2450
2002-01-18 Recognize GT-xxxx type scanners also when using the SCSI
2002-01-18 Recognize GT-xxxx type scanners also when using the SCSI
or IEEE-1394 interface
2002-01-06 Disable TEST_IOCTL again, which was enabled by accident. Also
protect the ioctl portion with an #ifdef __linux__
2002-01-05 Version 0.2.17
Check for and set s->fd to -1 when device is closed.
Check for and set s->fd to -1 when device is closed.
Removed black gamma table - only use RGB even for grayscale
2002-01-01 Do not call access() for OS/2 systems
2001-11-13 Version 0.2.16
@@ -126,8 +126,8 @@
2001-06-09 Version 0.2.09
Changed debug level for sense handler from 0 to 2
2001-05-25 Version 0.2.07
Allow more than 8 bit color depth even for preview mode
since Xsane can handle this. Some code cleanup.
Allow more than 8 bit color depth even for preview mode
since Xsane can handle this. Some code cleanup.
2001-05-24 Removed ancient code that was used to determine the resolution
back when the backend still had a slider for the resolution
selection.
@@ -156,12 +156,12 @@
Fixed problem with bilevel scanning with Perfection610: The
line count has to be an even number with this scanner.
Several initialization fixes regarding bit depth selection.
This version goes back into the CVS repository, the 1.0.4
This version goes back into the CVS repository, the 1.0.4
release is out and therefore the code freeze is over.
Some general cleanup, added more comments.
2000-12-09 Version 0.2.00
Cleaned up printing of gamma table data. 16 elements
are now printed in one line without the [epson] in
are now printed in one line without the [epson] in
between the values. Values are only printed for
Debug levels >= 10.
2000-12-04 We've introduced the concept of inverting images
@@ -175,7 +175,7 @@
2000-12-03 added the 12/14/16 bit support again.
2000-12-03 Version 0.1.38
removed changes regarding 12/14 bit support because
of SANE feature freeze for 1.0.4. The D1 fix for
of SANE feature freeze for 1.0.4. The D1 fix for
reading the values from the scanner instead of using
hardcoded values and the fix for the off-by-one error
in the reorder routine are still in the code base.
@@ -194,13 +194,13 @@
sane/... include files.
2000-07-26 Fixed problem with Perfection610: The variable
s->color_shuffle_line was never correctly initialized
2000-06-28 When closing the scanner device the data that's
2000-06-28 When closing the scanner device the data that's
still in the scanner, waiting to be transferred
is flushed. This fixes the problem with scanimage -T
2000-06-13 Invert image when scanning negative with TPU,
Show film type only when TPU is selected
2000-06-13 Initialize optical_res to 0 (Dave Hill)
2000-06-07 Fix in sane_close() - found by Henning Meier-Geinitz
2000-06-07 Fix in sane_close() - found by Henning Meier-Geinitz
2000-06-01 Threshhold should only be active when scan depth
is 1 and halftoning is off. (mjp)
2000-05-28 Turned on scanner based color correction.
@@ -212,16 +212,16 @@
Help prevent extraneous option reloads. Split
sane_control_option in getvalue and setvalue.
Further split up setvalue into several different
routines. (mjp)
2000-05-21 In sane_close use close_scanner instead of just the
routines. (mjp)
2000-05-21 In sane_close use close_scanner instead of just the
SCSI close function.
2000-05-20 ... finally fixed the problem with the 610
Added resolution_list to Epson_Device structure in
epson.h - this fixes a bug that caused problems when
epson.h - this fixes a bug that caused problems when
more than one EPSON scanner was connected.
2000-05-13 Fixed the color problem with the Perfection 610. The few
lines with "garbage" at the beginning of the scan are not
yet removed.
yet removed.
2000-05-06 Added support for multiple EPSON scanners. At this time
this may not be bug free, but it's a start and it seems
to work well with just one scanner.
@@ -235,21 +235,21 @@
fix an OS/2 bug. It now turned out that they are not
necessary. The real fix was in the repository for a
long time (2000-01-25).
2000-03-19 Fixed problem with A4 level devices - they use the
line mode instead of the block mode. The routine to
handle this was screwed up pretty bad. Now I have
2000-03-19 Fixed problem with A4 level devices - they use the
line mode instead of the block mode. The routine to
handle this was screwed up pretty bad. Now I have
a solid version that handles all variations of line
mode (automatically deals with the order the color
lines are sent).
2000-03-06 Fixed occasional crash after warm up when the "in warmup
state" went away in between doing ESC G and getting the
extended status message.
2000-03-02 Code cleanup, disabled ZOOM until I have time to
extended status message.
2000-03-02 Code cleanup, disabled ZOOM until I have time to
deal with all the side effects.
2000-03-01 More D1 fixes. In the future I have to come up with
a more elegant solution to destinguish between different
function levels. The level > n does not work anymore with
D1.
D1.
Added support for "set threshold" and "set zoom".
2000-02-23 First stab at level D1 support, also added a test
for valid "set halftone" command to enable OPT_HALFTONE
@@ -275,11 +275,11 @@
because of hte changes to attach a few days ago. (KHK)
2000-01-29 fixed core dump with xscanimage by moving the gamma
curves to the standard interface (no longer advanced)
Removed pragma pack() from source code to make it
Removed pragma pack() from source code to make it
easier to compile on non-gcc compilers (KHK)
2000-01-26 fixed problem with resolution selection when using the
resolution list in xsane (KHK)
2000-01-25 moved the section where the device name is assigned
2000-01-25 moved the section where the device name is assigned
in attach. This avoids the core dump of frontend
applications when no scanner is found (Dave Hill)
2000-01-24 reorganization of SCSI related "helper" functions
@@ -395,7 +395,7 @@
#define EPSON_LEVEL_D7 12
#define EPSON_LEVEL_D8 13
/* there is also a function level "A5", which I'm igoring here until somebody can
/* there is also a function level "A5", which I'm igoring here until somebody can
convince me that this is still needed. The A5 level was for the GT-300, which
was (is) a monochrome only scanner. So if somebody really wants to use this
scanner with SANE get in touch with me and we can work something out - khk */
@@ -437,7 +437,7 @@ static EpsonCmdRec epson_cmd[] = {
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set bay
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set threshold
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set focus position
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request focus position
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request focus position
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
*/
@@ -460,7 +460,7 @@ static EpsonCmdRec epson_cmd[] = {
/*
* Definition of the mode_param struct, that is used to
* Definition of the mode_param struct, that is used to
* specify the valid parameters for the different scan modes.
*
* The depth variable gets updated when the bit depth is modified.
@@ -508,10 +508,10 @@ static const SANE_String_Const adf_mode_list[] = {
* of the scanner.
*/
static SANE_String_Const source_list[] = {
FBF_STR,
NULL,
NULL,
static SANE_String_Const source_list[] = {
FBF_STR,
NULL,
NULL,
NULL
};
@@ -519,9 +519,9 @@ static SANE_String_Const source_list[] = {
#define FILM_TYPE_POSITIVE (0)
#define FILM_TYPE_NEGATIVE (1)
static const SANE_String_Const film_list[] = {
SANE_I18N ("Positive Film"),
SANE_I18N ("Negative Film"),
static const SANE_String_Const film_list[] = {
SANE_I18N ("Positive Film"),
SANE_I18N ("Negative Film"),
NULL
};
@@ -538,67 +538,67 @@ static const SANE_String_Const focus_list[] = {
#define HALFTONE_NONE 0x01
#define HALFTONE_TET 0x03
static int halftone_params[] = {
HALFTONE_NONE,
0x00,
0x10,
0x20,
0x80,
0x90,
0xa0,
0xb0,
static int halftone_params[] = {
HALFTONE_NONE,
0x00,
0x10,
0x20,
0x80,
0x90,
0xa0,
0xb0,
HALFTONE_TET,
0xc0,
0xc0,
0xd0
};
static const SANE_String_Const halftone_list[] = {
SANE_I18N ("None"),
static const SANE_String_Const halftone_list[] = {
SANE_I18N ("None"),
SANE_I18N ("Halftone A (Hard Tone)"),
SANE_I18N ("Halftone B (Soft Tone)"),
SANE_I18N ("Halftone B (Soft Tone)"),
SANE_I18N ("Halftone C (Net Screen)"),
NULL
};
static const SANE_String_Const halftone_list_4[] = {
SANE_I18N ("None"),
static const SANE_String_Const halftone_list_4[] = {
SANE_I18N ("None"),
SANE_I18N ("Halftone A (Hard Tone)"),
SANE_I18N ("Halftone B (Soft Tone)"),
SANE_I18N ("Halftone C (Net Screen)"),
SANE_I18N ("Dither A (4x4 Bayer)"),
SANE_I18N ("Dither B (4x4 Spiral)"),
SANE_I18N ("Dither C (4x4 Net Screen)"),
SANE_I18N ("Dither D (8x4 Net Screen)"),
NULL
};
static const SANE_String_Const halftone_list_7[] = {
SANE_I18N ("None"),
SANE_I18N ("Halftone A (Hard Tone)"),
SANE_I18N ("Halftone B (Soft Tone)"),
SANE_I18N ("Halftone B (Soft Tone)"),
SANE_I18N ("Halftone C (Net Screen)"),
SANE_I18N ("Dither A (4x4 Bayer)"),
SANE_I18N ("Dither B (4x4 Spiral)"),
SANE_I18N ("Dither C (4x4 Net Screen)"),
SANE_I18N ("Dither D (8x4 Net Screen)"),
SANE_I18N ("Text Enhanced Technology"),
SANE_I18N ("Download pattern A"),
SANE_I18N ("Download pattern B"),
NULL
};
static int dropout_params[] = {
static const SANE_String_Const halftone_list_7[] = {
SANE_I18N ("None"),
SANE_I18N ("Halftone A (Hard Tone)"),
SANE_I18N ("Halftone B (Soft Tone)"),
SANE_I18N ("Halftone C (Net Screen)"),
SANE_I18N ("Dither A (4x4 Bayer)"),
SANE_I18N ("Dither B (4x4 Spiral)"),
SANE_I18N ("Dither C (4x4 Net Screen)"),
SANE_I18N ("Dither D (8x4 Net Screen)"),
SANE_I18N ("Text Enhanced Technology"),
SANE_I18N ("Download pattern A"),
SANE_I18N ("Download pattern B"),
NULL
};
static int dropout_params[] = {
0x00, /* none */
0x10, /* red */
0x20, /* green */
0x30 /* blue */
};
static const SANE_String_Const dropout_list[] = {
SANE_I18N ("None"),
SANE_I18N ("Red"),
static const SANE_String_Const dropout_list[] = {
SANE_I18N ("None"),
SANE_I18N ("Red"),
SANE_I18N ("Green"),
SANE_I18N ("Blue"),
SANE_I18N ("Blue"),
NULL
};
@@ -606,34 +606,34 @@ static const SANE_String_Const dropout_list[] = {
* Color correction:
* One array for the actual parameters that get sent to the scanner (color_params[]),
* one array for the strings that get displayed in the user interface (color_list[])
* and one array to mark the user defined color correction (dolor_userdefined[]).
* and one array to mark the user defined color correction (dolor_userdefined[]).
*/
static int color_params[] = {
0x00,
0x01,
0x10,
0x20,
0x40,
static int color_params[] = {
0x00,
0x01,
0x10,
0x20,
0x40,
0x80
};
static SANE_Bool color_userdefined[] = {
SANE_FALSE,
SANE_TRUE,
SANE_FALSE,
SANE_FALSE,
SANE_FALSE,
static SANE_Bool color_userdefined[] = {
SANE_FALSE,
SANE_TRUE,
SANE_FALSE,
SANE_FALSE,
SANE_FALSE,
SANE_FALSE
};
static const SANE_String_Const color_list[] = {
SANE_I18N ("No Correction"),
static const SANE_String_Const color_list[] = {
SANE_I18N ("No Correction"),
SANE_I18N ("User defined"),
SANE_I18N ("Impact-dot printers"),
SANE_I18N ("Impact-dot printers"),
SANE_I18N ("Thermal printers"),
SANE_I18N ("Ink-jet printers"),
SANE_I18N ("CRT monitors"),
SANE_I18N ("CRT monitors"),
NULL
};
@@ -644,20 +644,20 @@ static const SANE_String_Const color_list[] = {
* the actally used params and list arrays at runtime.
*/
static int gamma_params_ab[] = {
0x01,
0x03,
0x00,
0x10,
static int gamma_params_ab[] = {
0x01,
0x03,
0x00,
0x10,
0x20
};
static const SANE_String_Const gamma_list_ab[] = {
SANE_I18N ("Default"),
static const SANE_String_Const gamma_list_ab[] = {
SANE_I18N ("Default"),
SANE_I18N ("User defined"),
SANE_I18N ("High density printing"),
SANE_I18N ("High density printing"),
SANE_I18N ("Low density printing"),
SANE_I18N ("High contrast printing"),
SANE_I18N ("High contrast printing"),
NULL
};
@@ -669,14 +669,14 @@ static SANE_Bool gamma_userdefined_ab[] = {
SANE_FALSE,
};
static int gamma_params_d[] = {
0x03,
static int gamma_params_d[] = {
0x03,
0x04
};
static const SANE_String_Const gamma_list_d[] = {
static const SANE_String_Const gamma_list_d[] = {
SANE_I18N ("User defined (Gamma=1.0)"),
SANE_I18N ("User defined (Gamma=1.8)"),
SANE_I18N ("User defined (Gamma=1.8)"),
NULL
};
@@ -701,13 +701,13 @@ static unsigned int w_cmd_count = 0;
* this is used for the FilmScan
*/
static const SANE_String_Const bay_list[] = {
" 1 ",
" 2 ",
" 3 ",
" 4 ",
" 5 ",
" 6 ",
static const SANE_String_Const bay_list[] = {
" 1 ",
" 2 ",
" 3 ",
" 4 ",
" 5 ",
" 6 ",
NULL
};
@@ -744,7 +744,7 @@ struct qf_param
};
/* gcc don't like to overwrite const field */
static /*const */ struct qf_param qf_params[] = {
static /*const */ struct qf_param qf_params[] = {
{0, 0, SANE_FIX (120.0), SANE_FIX (120.0)},
{0, 0, SANE_FIX (148.5), SANE_FIX (210.0)},
{0, 0, SANE_FIX (210.0), SANE_FIX (148.5)},
@@ -753,13 +753,13 @@ static /*const */ struct qf_param qf_params[] = {
{0, 0, 0, 0}
};
static const SANE_String_Const qf_list[] = {
SANE_I18N ("CD"),
SANE_I18N ("A5 portrait"),
static const SANE_String_Const qf_list[] = {
SANE_I18N ("CD"),
SANE_I18N ("A5 portrait"),
SANE_I18N ("A5 landscape"),
SANE_I18N ("Letter"),
SANE_I18N ("A4"),
SANE_I18N ("Max"),
SANE_I18N ("Letter"),
SANE_I18N ("A4"),
SANE_I18N ("Max"),
NULL
};
@@ -770,7 +770,7 @@ static SANE_Word *bitDepthList = NULL;
/*
* List of pointers to devices - will be dynamically allocated depending
* on the number of devices found.
* on the number of devices found.
*/
static const SANE_Device **devlist = 0;
@@ -1199,10 +1199,10 @@ set_resolution (Epson_Scanner * s, int xres, int yres)
}
/*
* set_scan_area()
* set_scan_area()
*
* Sends the "set scan area" command to the scanner with the currently selected
* scan area. This scan area is already corrected for "color shuffling" if
* Sends the "set scan area" command to the scanner with the currently selected
* scan area. This scan area is already corrected for "color shuffling" if
* necessary.
*/
static SANE_Status
@@ -1472,7 +1472,7 @@ DetectSize:
* is reported as a warning (only visible if debug level is set to 10 or greater) -
* every other condition is reported as an error.
*
* This function only gets called when we are dealing with a scanner that supports the
* This function only gets called when we are dealing with a scanner that supports the
* "warming up" code, so it's not a problem for B3 level scanners, that don't handle
* request extended status commands.
*/
@@ -1650,7 +1650,7 @@ close_scanner (Epson_Scanner * s)
if (s->fd == -1)
return;
if (r_cmd_count % 2)
if (r_cmd_count % 2)
{
/* send a request_status. This toggles w_cmd_count and r_cmd_count */
u_char param[3];
@@ -1668,7 +1668,7 @@ close_scanner (Epson_Scanner * s)
DBG (5, "w_cmd_count = %d\n",w_cmd_count);
DBG (5, "r_cmd_count = %d\n",r_cmd_count);
if (w_cmd_count % 2)
if (w_cmd_count % 2)
{
int junk1,junk2;
@@ -1700,8 +1700,8 @@ close_scanner (Epson_Scanner * s)
/*
* open_scanner()
*
* Open the scanner device. Depending on the connection method,
* different open functions are called.
* Open the scanner device. Depending on the connection method,
* different open functions are called.
*/
static SANE_Status
@@ -1798,7 +1798,7 @@ feed (Epson_Scanner * s)
/*
* eject()
*
*
* Eject the current page from the ADF. The scanner is opened prior to
* sending the command and closed afterwards.
*
@@ -2011,7 +2011,7 @@ attach (const char *dev_name, Epson_Device * *devp, int type)
}
/* check for PIO devices */
/* can we convert the device name to an integer? This is only possible
/* can we convert the device name to an integer? This is only possible
with PIO devices */
port = atoi (dev_name);
if (port != 0)
@@ -2088,7 +2088,7 @@ attach (const char *dev_name, Epson_Device * *devp, int type)
buf[INQUIRY_BUF_SIZE] = 0;
DBG (1, ">%s<\n", buf + 8);
/*
/*
* For USB and PIO scanners this will be done later, once
* we have communication established with the device.
*/
@@ -2140,7 +2140,7 @@ attach (const char *dev_name, Epson_Device * *devp, int type)
status = sanei_usb_find_devices (vendor, product, attach_one_usb);
}
return SANE_STATUS_INVAL; /* return - the attach_one_usb()
return SANE_STATUS_INVAL; /* return - the attach_one_usb()
will take care of this */
}
@@ -2179,7 +2179,7 @@ attach (const char *dev_name, Epson_Device * *devp, int type)
is_valid = SANE_FALSE;
i = 0;
/* check all known product IDs to verify that we know
/* check all known product IDs to verify that we know
about the device */
while (i != numIds && !is_valid)
{
@@ -2287,7 +2287,7 @@ attach (const char *dev_name, Epson_Device * *devp, int type)
/*
* Check for "request focus position" command. If this command is
* Check for "request focus position" command. If this command is
* supported, then the scanner does also support the "set focus
* position" command.
*/
@@ -2350,10 +2350,10 @@ attach (const char *dev_name, Epson_Device * *devp, int type)
* this also requests the scanner device name from the scanner
*/
/*
* because we are also using the device name from this command,
* because we are also using the device name from this command,
* we have to run this block even if the scanner does not report
* an extension. The extensions are only reported if the ADF or
* the TPU are actually detected.
* the TPU are actually detected.
*/
if (s->hw->cmd->request_extended_status != 0)
{
@@ -2493,7 +2493,7 @@ attach (const char *dev_name, Epson_Device * *devp, int type)
SANE_FIX ((buf[10] << 8 | buf[9]) * 25.4 / dev->dpi_range.max);
dev->tpu_y_range.quant = 0;
/*
/*
* Check for Perfection 4990 photo/GT-X800 scanner.
* This scanner only report 3200 dpi back.
* The scanner fysical supports 4800 dpi.
@@ -2503,11 +2503,11 @@ attach (const char *dev_name, Epson_Device * *devp, int type)
*/
if (strncmp((char *) buf + 0x1A,"GT-X800",7) == 0)
{
dev->tpu_x_range.max = (dev->tpu_x_range.max/32)*48;
dev->tpu_y_range.max = (dev->tpu_y_range.max/32)*48;
dev->tpu_x_range.max = (dev->tpu_x_range.max/32)*48;
dev->tpu_y_range.max = (dev->tpu_y_range.max/32)*48;
DBG (5, "dpi_range.max %x \n", dev->dpi_range.max);
}
DBG (5, "tpu tlx %f tly %f brx %f bry %f [mm]\n",
SANE_UNFIX (dev->tpu_x_range.min),
SANE_UNFIX (dev->tpu_y_range.min),
@@ -2597,8 +2597,8 @@ attach (const char *dev_name, Epson_Device * *devp, int type)
close_scanner (s);
/*
* we are done with this one, prepare for the next scanner:
/*
* we are done with this one, prepare for the next scanner:
*/
++num_devices;
@@ -2689,7 +2689,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
{
int numIds;
/* add the vendor and product IDs to the list of
/* add the vendor and product IDs to the list of
known devices before we call the attach function */
numIds = sanei_epson_getNumberOfUSBProductIds ();
if (vendor != 0x4b8)
@@ -2723,7 +2723,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
/*
* void sane_exit(void)
*
* Clean up the list of attached scanners.
* Clean up the list of attached scanners.
*/
void
@@ -2914,11 +2914,11 @@ init_options (Epson_Scanner * s)
s->opt[OPT_GAMMA_CORRECTION].type = SANE_TYPE_STRING;
s->opt[OPT_GAMMA_CORRECTION].constraint_type = SANE_CONSTRAINT_STRING_LIST;
/*
/*
* special handling for D1 function level - at this time I'm not
* testing for D1, I'm just assuming that all D level scanners will
* behave the same way. This has to be confirmed with the next D-level
* scanner
* scanner
*/
if (s->hw->cmd->level[0] == 'D')
{
@@ -2944,7 +2944,7 @@ init_options (Epson_Scanner * s)
/* gamma vector */
/*
/*
s->opt[ OPT_GAMMA_VECTOR].name = SANE_NAME_GAMMA_VECTOR;
s->opt[ OPT_GAMMA_VECTOR].title = SANE_TITLE_GAMMA_VECTOR;
s->opt[ OPT_GAMMA_VECTOR].desc = SANE_DESC_GAMMA_VECTOR;
@@ -3585,7 +3585,7 @@ sane_close (SANE_Handle handle)
Epson_Scanner *s, *prev;
/*
* Test if there is still data pending from
* Test if there is still data pending from
* the scanner. If so, then do a cancel
*/
@@ -3828,14 +3828,14 @@ handle_source (Epson_Scanner * s, SANE_Int optindex, char *value)
Handles setting the source (flatbed, transparency adapter (TPU),
or auto document feeder (ADF)).
For newer scanners it also sets the focus according to the
For newer scanners it also sets the focus according to the
glass / TPU settings.
*/
{
int force_max = SANE_FALSE;
SANE_Bool dummy;
/* reset the scanner when we are changing the source setting -
/* reset the scanner when we are changing the source setting -
this is necessary for the Perfection 1650 */
if (s->hw->need_reset_on_source_change)
reset (s);
@@ -4237,7 +4237,7 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
DBG (5, "sane_get_parameters()\n");
/*
/*
* If sane_start was already called, then just retrieve the parameters
* from the scanner data structure
*/
@@ -4275,7 +4275,7 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
s->params.lines =
SANE_UNFIX (s->val[OPT_BR_Y].w - s->val[OPT_TL_Y].w) / 25.4 * ndpi + 0.5;
/*
/*
* Make sure that the number of lines is correct for color shuffling:
* The shuffling alghorithm produces 2xline_distance lines at the
* beginning and the same amount at the end of the scan that are not
@@ -4302,10 +4302,10 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
SANE_UNFIX (s->val[OPT_BR_Y].w));
/*
* Calculate bytes_per_pixel and bytes_per_line for
/*
* Calculate bytes_per_pixel and bytes_per_line for
* any color depths.
*
*
* The default color depth is stored in mode_params.depth:
*/
@@ -4320,8 +4320,8 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
if (s->params.depth > 8)
{
s->params.depth = 16; /*
* The frontends can only handle 8 or 16 bits
s->params.depth = 16; /*
* The frontends can only handle 8 or 16 bits
* for gray or color - so if it's more than 8,
* it gets automatically set to 16. This works
* as long as EPSON does not come out with a
@@ -4366,7 +4366,7 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
/*
* sane_start()
*
* This function is part of the SANE API and gets called from the front end to
* This function is part of the SANE API and gets called from the front end to
* start the scan process.
*
*/
@@ -4396,7 +4396,7 @@ sane_start (SANE_Handle handle)
* off 0 ACK
* off 1 NAK
*
* It makes no sense to scan with TPU powered on and source flatbed, because
* It makes no sense to scan with TPU powered on and source flatbed, because
* light will come from both sides.
*/
@@ -4447,7 +4447,7 @@ sane_start (SANE_Handle handle)
}
/*
/*
* set the focus position according to the extension used:
* if the TPU is selected, then focus 2.5mm above the glass,
* otherwise focus on the glass. Scanners that don't support
@@ -4499,7 +4499,7 @@ sane_start (SANE_Handle handle)
}
/*
* The byte sequence mode was introduced in B5, for B[34] we need line sequence mode
* The byte sequence mode was introduced in B5, for B[34] we need line sequence mode
*/
if ((s->hw->cmd->level[0] == 'D' ||
@@ -4641,7 +4641,7 @@ sane_start (SANE_Handle handle)
if (s->hw->cmd->level[0] == 'D')
{
/*
* The D1 level has only the two user defined gamma
* The D1 level has only the two user defined gamma
* settings.
*/
val = gamma_params[s->val[OPT_GAMMA_CORRECTION].w];
@@ -4652,8 +4652,8 @@ sane_start (SANE_Handle handle)
/*
* If "Default" is selected then determine the actual value
* to send to the scanner: If bilevel mode, just send the
* value from the table (0x01), for grayscale or color mode
* to send to the scanner: If bilevel mode, just send the
* value from the table (0x01), for grayscale or color mode
* add one and send 0x02.
*/
/* if( s->val[ OPT_GAMMA_CORRECTION].w <= 1) { */
@@ -4766,7 +4766,7 @@ sane_start (SANE_Handle handle)
/*
* If WAIT_FOR_BUTTON is active, then do just that: Wait until the button is
* If WAIT_FOR_BUTTON is active, then do just that: Wait until the button is
* pressed. If the button was already pressed, then we will get the button
* Pressed event right away.
*/
@@ -4841,8 +4841,8 @@ sane_start (SANE_Handle handle)
s->hw->color_shuffle = SANE_FALSE;
}
/*
* for debugging purposes:
/*
* for debugging purposes:
*/
#ifdef FORCE_COLOR_SHUFFLE
DBG (1, "Test mode: FORCE_COLOR_SHUFFLE = TRUE\n");
@@ -4850,7 +4850,7 @@ sane_start (SANE_Handle handle)
#endif
/*
/*
* Modify the scan area: If the scanner requires color shuffling, then we try to
* scan more lines to compensate for the lines that will be removed from the scan
* due to the color shuffling alghorithm.
@@ -4872,7 +4872,7 @@ sane_start (SANE_Handle handle)
s->params.lines += 4 * s->line_distance;
}
/*
/*
* If (top + s->params.lines) is larger than the max scan area, reset
* the number of scan lines:
*/
@@ -4897,7 +4897,7 @@ sane_start (SANE_Handle handle)
lcount = 1;
/*
* The set line count commands needs to be sent for certain scanners in
* The set line count commands needs to be sent for certain scanners in
* color mode. The D1 level requires it, we are however only testing for
* 'D' and not for the actual numeric level.
*/
@@ -5167,7 +5167,7 @@ read_data_block (Epson_Scanner * s, EpsonDataRec * result)
/*
* Hack Alert!!!
* If the status is SANE_STATUS_DEVICE_BUSY then we need to
* If the status is SANE_STATUS_DEVICE_BUSY then we need to
* re-issue the command again. We can assume that the command that
* caused this problem was ESC G, so in a loop with a sleep 1 we
* are testing this over and over and over again, until the lamp
@@ -5319,7 +5319,7 @@ START_READ:
*/
/*
/*
* read the first color line - the number of bytes to read
* is already known (from last call to read_data_block()
* We determine where to write the line from the color information
@@ -5345,7 +5345,7 @@ START_READ:
if (SANE_STATUS_GOOD != status)
return status;
/*
/*
* send the ACK signal to the scanner in order to make
* it ready for the next data block.
*/
@@ -5484,7 +5484,7 @@ START_READ:
*/
/*
* Some scaners (e.g. the Perfection 1640 and GT-2200) seem
* Some scaners (e.g. the Perfection 1640 and GT-2200) seem
* to have the R and G channels swapped.
* The GT-8700 is the Asian version of the Perfection1640.
* If the scanner name is one of these, and the scan mode is
@@ -5499,9 +5499,9 @@ START_READ:
s->params.format == SANE_FRAME_RGB;
/*
* Certain Perfection 1650 also need this re-ordering of the two
* color channels. These scanners are identified by the problem
* with the half vertical scanning area. When we corrected this,
* Certain Perfection 1650 also need this re-ordering of the two
* color channels. These scanners are identified by the problem
* with the half vertical scanning area. When we corrected this,
* we also set the variable s->hw->need_color_reorder
*/
if (s->hw->need_color_reorder)
@@ -5551,7 +5551,7 @@ START_READ:
}
}
/*
/*
* Do the color_shuffle if everything else is correct - at this time
* most of the stuff is hardcoded for the Perfection 610
*/
@@ -5562,8 +5562,8 @@ START_READ:
status = color_shuffle (s, &new_length);
/*
* If no bytes are returned, check if the scanner is already done, if so,
/*
* If no bytes are returned, check if the scanner is already done, if so,
* we'll probably just return, but if there is more data to process get
* the next batch.
*/
@@ -5584,7 +5584,7 @@ START_READ:
/*
/*
* copy the image data to the data memory area
*/
@@ -5689,10 +5689,10 @@ color_shuffle (SANE_Handle handle, int *new_length)
/*
* Initialize the variables we are going to use for the
* Initialize the variables we are going to use for the
* copying of the data. data_ptr is the pointer to
* the currently worked on scan line. data_end is the
* end of the data area as calculated from adding *length
* end of the data area as calculated from adding *length
* to the start of data.
* out_data_ptr is used when writing out the processed data
* and always points to the beginning of the next line to
@@ -5709,7 +5709,7 @@ color_shuffle (SANE_Handle handle, int *new_length)
/*
* The buffer area is supposed to have a number of full scan
* lines, let's test if this is the case.
* lines, let's test if this is the case.
*/
if (length % s->params.bytes_per_line != 0)
@@ -5785,7 +5785,7 @@ color_shuffle (SANE_Handle handle, int *new_length)
*/
/*
* Strip the first and last n lines and limit to
* Strip the first and last n lines and limit to
*/
if ((s->current_output_line >= s->line_distance) &&
(s->current_output_line < s->params.lines + s->line_distance))
@@ -5800,9 +5800,9 @@ color_shuffle (SANE_Handle handle, int *new_length)
/*
* Now remove the 0-entry and move all other
* lines up by one. There are 2*line_distance + 1
* buffers, * therefore the loop has to run from 0
* Now remove the 0-entry and move all other
* lines up by one. There are 2*line_distance + 1
* buffers, * therefore the loop has to run from 0
* to * 2*line_distance, and because we want to
* copy every n+1st entry to n the loop runs
* from - to 2*line_distance-1!
@@ -6008,7 +6008,7 @@ get_identity_information (SANE_Handle handle)
DBG (1, "maximum scan area: x %d y %d\n", x, y);
k = 5;
/*
/*
* Check for Perfection 4990 photo/GT-X800 scanner.
* This scanner only report 3200 dpi back.
* The scanner fysical supports 4800 dpi.
@@ -6031,8 +6031,8 @@ get_identity_information (SANE_Handle handle)
DBG (1, "product name %x %x %x %x %x %x %x %x \n", buf[0], buf[1],buf[2],buf[3],buf[4], buf[5],buf[6], buf[7] );
if (strncmp((char *) buf,"GT-X800",7) == 0)
{
int val = 0x12 << 8 | 0xC0;
int val = 0x12 << 8 | 0xC0;
s->hw->res_list_size++;
s->hw->res_list =
(SANE_Int *) realloc (s->hw->res_list,
@@ -6169,7 +6169,7 @@ get_identity2_information (SANE_Handle handle)
/*
* void sane_cancel(SANE_Handle handle)
*
*
* Set the cancel flag to true. The next time the backend requests data
* from the scanner the CAN message will be sent.
*/
@@ -6260,7 +6260,7 @@ request_focus_position (SANE_Handle handle, u_char * position)
/*
* Request the push button status
* Request the push button status
* returns SANE_TRUE if the button was pressed
* and SANE_FALSE if the button was not pressed
* it also returns SANE_TRUE in case of an error.
backend/epson.conf.in
+1 -1
View File
@@ -16,7 +16,7 @@ scsi "EPSON SC"
# There are two different methods of configuring a USB scanner: libusb and the kernel module
# For any system with libusb support (which is pretty much any recent Linux distribution) the
# following line is sufficient. This however assumes that the connected scanner (or to be more
# accurate, it's device ID) is known to the backend.
# accurate, it's device ID) is known to the backend.
usb
# For libusb support for unknown scanners use the following command
# usb <product ID> <device ID>
backend/epson2-commands.c
+4 -4
View File
@@ -199,7 +199,7 @@ round_cct(double org_cct[], int rnd_cct[])
mult_cct[i] = org_cct[i] * 32;
rnd_cct[i] = (int) floor(mult_cct[i] + 0.5);
}
do {
for (i = 0; i < 3; i++) {
@@ -265,8 +265,8 @@ profile_to_colorcoeff(double *profile, unsigned char *color_coeff)
for (i = 0; i < 9; i++)
color_coeff[i] = int2cpt(color_table[cc_idx[i]]);
}
/*
* Sends the "set color correction coefficients" command with the
* currently selected parameters to the scanner.
@@ -825,7 +825,7 @@ esci_request_command_parameter(SANE_Handle handle, unsigned char *buf)
return status;
}
/* ESC q - Request Focus Position
/* ESC q - Request Focus Position
* -> ESC q
* <- Information block
* <- Focus position status (2)
backend/epson2-ops.c
+4 -4
View File
@@ -66,7 +66,7 @@
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set bay
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set threshold
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set focus position
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request focus position
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request focus position
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request extended identity
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request scanner status
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
@@ -160,7 +160,7 @@ e2_dev_init(Epson_Device *dev, const char *devname, int conntype)
dev->need_double_vertical = SANE_FALSE;
dev->cct_profile = &epson_cct_profiles[0]; /* default profile */
dev->cmd = &epson_cmd[EPSON_LEVEL_DEFAULT];
/* Change default level when using a network connection */
@@ -936,8 +936,8 @@ e2_set_extended_scanning_parameters(Epson_Scanner * s)
}
if (s->val[OPT_MODE].w == MODE_INFRARED) {
/* only infrared in TPU mode (NOT in TPU2 or flatbeth)
* XXX investigate this ... only tested on GT-X800
/* only infrared in TPU mode (NOT in TPU2 or flatbeth)
* XXX investigate this ... only tested on GT-X800
*/
if (extensionCtrl == 1) /* test for TPU */
backend/epson2.c
+17 -17
View File
@@ -241,7 +241,7 @@ enum {
* therefore I define two different sets of arrays, plus one set of
* variables that get set to the actally used params and list arrays at runtime.
*/
static int gamma_params_ab[] = {
0x01,
0x03,
@@ -497,7 +497,7 @@ open_scanner(Epson_Scanner *s)
DBG(32, "scanner locked\n");
}
} else if (s->hw->connection == SANE_EPSON_SCSI)
status = sanei_scsi_open(s->hw->sane.name, &s->fd,
sanei_epson2_scsi_sense_handler,
@@ -515,7 +515,7 @@ open_scanner(Epson_Scanner *s)
DBG(1, "disable any conflicting driver (like usblp).\n");
}
if (status != SANE_STATUS_GOOD)
if (status != SANE_STATUS_GOOD)
DBG(1, "%s open failed: %s\n", s->hw->sane.name,
sane_strstatus(status));
else
@@ -604,7 +604,7 @@ detect_usb(struct Epson_Scanner *s, SANE_Bool assume_valid)
DBG(1, "the device cannot be verified - will continue\n");
return SANE_STATUS_GOOD;
}
/* check the vendor ID to see if we are dealing with an EPSON device */
if (vendor != SANE_EPSON_VENDOR_ID) {
/* this is not a supported vendor ID */
@@ -631,11 +631,11 @@ detect_usb(struct Epson_Scanner *s, SANE_Bool assume_valid)
s->hw->sane.name, product);
return SANE_STATUS_INVAL;
}
DBG(1, "found valid Epson scanner: 0x%x/0x%x (vendorID/productID)\n",
vendor, product);
return SANE_STATUS_GOOD;
return SANE_STATUS_GOOD;
}
static int num_devices; /* number of scanners attached to backend */
@@ -684,7 +684,7 @@ device_detect(const char *name, int type, SANE_Bool assume_valid, SANE_Status *s
*status = SANE_STATUS_INVAL;
return NULL;
}
/* alloc and clear our device structure */
dev = malloc(sizeof(*dev));
if (!dev) {
@@ -797,7 +797,7 @@ attach_one_usb(const char *dev)
static SANE_Status
attach_one_net(const char *dev)
{
char name[39+4];
char name[39+4];
DBG(7, "%s: dev = %s\n", __func__, dev);
@@ -821,7 +821,7 @@ attach_one_config(SANEI_Config __sane_unused__ *config, const char *line)
int len = strlen(line);
DBG(7, "%s: len = %d, line = %s\n", __func__, len, line);
if (sscanf(line, "usb %i %i", &vendor, &product) == 2) {
/* add the vendor and product IDs to the list of
@@ -1248,7 +1248,7 @@ init_options(Epson_Scanner *s)
/* if (!s->hw->cmd->set_color_correction)
s->opt[OPT_FILM_TYPE].cap |= SANE_CAP_INACTIVE;
*/
*/
/* mirror */
s->opt[OPT_MIRROR].name = "mirror";
@@ -1501,12 +1501,12 @@ sane_open(SANE_String_Const name, SANE_Handle *handle)
if (s == NULL)
return status;
} else {
/* as a last resort, check for a match
* in the device list. This should handle SCSI
* devices and platforms without libusb.
*/
if (first_dev == NULL)
probe_devices();
@@ -1515,7 +1515,7 @@ sane_open(SANE_String_Const name, SANE_Handle *handle)
DBG(1, "invalid device name: %s\n", name);
return SANE_STATUS_INVAL;
}
}
}
}
@@ -1538,7 +1538,7 @@ sane_open(SANE_String_Const name, SANE_Handle *handle)
}
*handle = (SANE_Handle)s;
return SANE_STATUS_GOOD;
}
@@ -2132,7 +2132,7 @@ sane_start(SANE_Handle handle)
return status;
}
if (s->val[OPT_COLOR_CORRECTION].w == CORR_AUTO) { /* Automatic */
DBG(1, "using built in CCT profile\n");
@@ -2142,7 +2142,7 @@ sane_start(SANE_Handle handle)
if (0) { /* XXX TPU */
/* XXX check this */
if (s->val[OPT_FILM_TYPE].w == 0)
e2_load_cct_profile(s, CCTP_COLORPOS);
@@ -2153,7 +2153,7 @@ sane_start(SANE_Handle handle)
e2_load_cct_profile(s, CCTP_REFLECTIVE);
}
}
/* ESC m, user defined color correction */
if (s->hw->cmd->set_color_correction_coefficients
&& correction_userdefined[s->val[OPT_COLOR_CORRECTION].w]) {
backend/epson2.conf.in
+1 -1
View File
@@ -21,7 +21,7 @@ usb
# usb 0x4b8 0x110
# Network
#
#
# net 192.168.1.123
net autodiscovery
backend/epson2_net.c
+2 -2
View File
@@ -124,7 +124,7 @@ sanei_epson_net_read(Epson_Scanner *s, unsigned char *buf, ssize_t wanted,
if (read < 0) {
return 0;
}
/* } else if (wanted < size && s->netlen == size) { */
} else {
DBG(23, "%s: partial read\n", __func__);
@@ -187,7 +187,7 @@ sanei_epson_net_write(Epson_Scanner *s, unsigned int cmd, const unsigned char *b
DBG(24, "H1[0]: %02x %02x %02x %02x\n", h1[0], h1[1], h1[2], h1[3]);
if((cmd >> 8) == 0x20) {
htobe32a(&h1[6], buf_size + 8);
htobe32a(&h1[6], buf_size + 8);
htobe32a(&h2[0], buf_size);
htobe32a(&h2[4], reply_len);
backend/epson2_usb.c
+1 -1
View File
@@ -171,7 +171,7 @@ SANE_Word sanei_epson_usb_product_ids[] = {
0x8ca, /* L850 Series */
0x8cd, /* WF-R4640 Series, WF-R5690 Series */
0x8d0, /* PX-M350F, WF-M5690 Series */
0 /* last entry - this is used for devices that are specified
0 /* last entry - this is used for devices that are specified
in the config file as "usb <vendor> <product>" */
};

Some files were not shown because too many files have changed in this diff Show More