Wykres commitów

34 Commity (0146888d79e7abfb81d977df1dd6a75e65bb0e11)

Autor SHA1 Wiadomość Data
Ralph Little fdc23d129a 1) Correct some spelling mistakes
2) Convert some British spellings to US
3) Modified some longer sentences to improve readability.
4) Modified en_GB to suit
2019-08-05 20:54:18 -07:00
Olaf Meeuwissen a52d843da4 canon: Fix [-Wunused-const-variable=] compiler warning
The papersize_list hasn't been used for anything since the initial
revision of the file.
2017-06-26 10:34:14 +09:00
Olaf Meeuwissen 23891a2646 .editorconfig: trim trailing whitespace 2017-05-29 21:14:29 +09:00
Ondrej Zary 19cedde244 canon: Fix cancel for Canon IX-4015
IX-4015 requires medium_position after cancelling a scan. Without that, it
does not return to home position and refuses to accept any other commands.
2012-10-18 20:27:30 -04:00
Ondrej Zary 8e627110cd canon: Add support for Canon IX-4015 scanner
This adds support for Canon IX-4015 scanner. The difference from other scanners
supported by this backend is that it has no highlight and shadow settings - the
corresponding bytes in set_window command must be zero or it will fail.

IX-4015 has optical resolution of 400 dpi, can interpolate up to 800 dpi (color)
or 1200 dpi (grayscale).
2012-10-18 20:27:30 -04:00
Ondrej Zary 1594aa5a05 canon: Separate diagnose and calibrate capabilities
Some scanners (e.g. IX-4015) support diangostics but not calibration
so separate these two capabilities.
2012-10-18 20:27:30 -04:00
Ondrej Zary d750ed0b12 canon: Fix sense_handler
sense_handler() crashes with Canon IX-4015 after the scanner is powered on because
scanner returns "unit attention - power on reset" sense status as a reply to the
"Test Unit Ready" command after power on - and dev is still NULL at that time.

The non-NULL dev is needed only to check if the device is a scsi2 device. But all devices
supported by this backend have the is_scsi2 flag set so it's useless.

So remove the flag and all its usage. Also change the return value for "power on
reset" check condition to SANE_STATUS_GOOD to allow IX-4015 to work.
2012-10-18 20:27:29 -04:00
m. allan noah ff048f4176 add three new SANE_VALUE macros and use mode name macros from saneopts.h 2010-02-10 23:48:21 -05:00
Alessandro Zummo b39c12dd7b Define MM_PER_INCH once for all 2009-06-18 15:54:49 +02:00
m. allan noah 006d5c4197 clamp film type to correct range 2009-05-26 21:08:43 -04:00
m. allan noah 7dab2ed86b clamp film type to allowed range (bug #311685) 2009-05-26 08:53:02 -04:00
chris@cnpbagwell.com 4d9e8138af standardize including local sane/ include files.
Source code was inconsistent on how they were referencing
include files in include/sane.  In certain cases, sane/sane.h
and sane/saneopts.h was really including external copies (with
some preprocessor implementations anyways).
2009-05-07 22:06:20 -05:00
m. allan noah b85947768d backend/*.[ch]: more consistent #include "../include/sane/config.h" 2009-02-25 02:11:17 +00:00
Julien BLACHE 7ca41423ac OPT_NUM_OPTS must be of type SANE_TYPE_INT. 2007-10-26 14:56:38 +00:00
Giuseppe Sacco d19db5e776 * Italian translation update
* Corrected a typo in backend/canon.c
2007-08-28 21:13:04 +00:00
Julien BLACHE ff5387ffa0 Apply patch from Nils Philippsen, turning 3 logical AND into bitwise AND (SANE bug #304363). 2007-07-30 13:42:39 +00:00
Mattias Ellert 17e9115fdd Fixed the "three-valued boolean" bug 2007-01-21 13:29:21 +00:00
Mattias Ellert 5d42e90718 String harmonization 2007-01-20 14:46:25 +00:00
Ulrich Deiters b06eb2220b Ulrich Deiters: disentangled some pointer arithmetics in canon-sane.c 2006-12-10 12:28:42 +00:00
Ulrich Deiters e55d3d8ce6 Ulrich Deiters: got rid of some compiler warnings 2006-06-15 15:55:28 +00:00
Ulrich Deiters 20aff8e022 restored actual version of the Canon-SCSI backend 2005-07-01 19:21:55 +00:00
Henning Geinitz af58065746 64 bit platform fixes (bug #300799). 2004-10-03 17:34:36 +00:00
Ulrich Deiters 19fed4c4f8 Ulrich Deiters: removed option "OPT_PAGE" from Canon-SCSI backend 2004-05-21 20:35:26 +00:00
Ulrich Deiters 6be161afe4 Ulrich Deiters: memory leak plugged, option settings for FS2700 corrected 2004-05-17 15:09:57 +00:00
Henning Geinitz 0e70e29baf Moved union Option_Value from backend header files to sanei_backend.h. No need
to copy it over and over again. Changed header inclusion order in backend
files to include backend.h after sanei_backend.h. Based on a patch from stef
<stef-listes@wanadoo.fr>.
2003-09-12 16:10:33 +00:00
Ulrich Deiters c6d5ebe9fb Modified behaviour of the option "eject after each scan":
Eject is suppresed for film scanners after preview scans.
2003-03-22 16:31:52 +00:00
Ulrich Deiters bf3546ca14 adjusted backend/canon-sane.c to use the new sanei_constrain_value()
made some cosmetic changes to reduce the number of compiler warnings
2003-02-28 09:35:24 +00:00
Ulrich Deiters 4fe497b559 * modified the Canon SCSI backend (now version 1.12):
* backend/canon.c, canon-sane.c, canon.h: Added support for
  the FB1200S flatbed scanner.
* backend/canon.c: Made the sense handler generate meaningful
  status information for new scanner models (solved the Mandrake
  crash problem).
* backend/canon.c, canon-sane.c, canon.h: Moved model-dependent
  declarations and decisions to a common location.
* backend/canon-sane.c: Fixed the out-of-memory problem of
  xscanimage when doing previews with scanners using hardware
  scan resolutions only.
2003-02-26 13:50:00 +00:00
Ulrich Deiters ce77a10475 Canon SCSI backend: fixed the problem of wrong string size allocation
in canon.c
2002-11-13 15:03:50 +00:00
Ulrich Deiters 0a43a10869 upgraded Canon SCSI backend to version 1.10:
modified invocations of sanei_scsi_open() to avoid crashes with Mandrake Linux
added support of focus control for the FS2710S film scanner
2002-11-13 13:22:49 +00:00
Abel Deuring 33846a6c94 backend/canon-sane.c, backend/canon-scsi.c, backend/canon.c,
backend/canon.h, doc/sane-canon.man,
doc/descriptions/canon.desc: added support for FB620S and
and FS2700, by Mitsuru Okaniwa <m-okaniwa@bea.hi-ho.ne.jp>
and Ulrich Deiters <ukd@xenon.pc.Uni-Koeln.DE>

Abel
2002-04-21 10:29:18 +00:00
Petter Reinholdtsen b4a1a513c9 Merge devel (v1.0.3) into head branch. 2000-08-12 15:11:46 +00:00
Petter Reinholdtsen 760423d864 Merged main branch with current DEVEL_1_9. 2000-03-05 13:57:25 +00:00
Petter Reinholdtsen 30ab5e718a Initial revision 1999-08-09 18:06:01 +00:00