cleanup manuals, .desc files, copyrights and #includes

ChangeLog

@@ -1,7 +1,10 @@
 2010-02-09 m. allan noah <kitno455 at gmail dot com>
 	* backend/fujitsu.c, doc/descriptions/fujitsu.desc,
-	  backend/epjitsu.c, doc/descriptions/epjitsu.desc:
-	- cleanup #include lines, copyrights and current scanner list.
+	  backend/canon_dr.c, doc/descriptions/canon_dr.desc,
+	  backend/epjitsu.c, doc/descriptions/epjitsu.desc,
+	  doc/sane-fujitsu.man, doc/sane-canon_dr.man, doc/sane-epjitsu.man,
+	  backend/epjitsu.conf.in:
+	- cleanup #include lines, copyrights, manual, and supported scanners.
 
 2010-02-08  Stéphane Voltz <stef.dev ar free.fr>
 	* backend/genesys.c backend/genesys.h backend/genesys_conv.c

backend/canon_dr.c

@@ -3,7 +3,7 @@
    This file is part of the SANE package, and implements a SANE backend
    for various Canon DR-series scanners.
 
-   Copyright (C) 2008-2009 m. allan noah
+   Copyright (C) 2008-2010 m. allan noah
 
    Corcaribe Tecnología C.A. www.cc.com.ve provided significant funding
    EvriChart, Inc. www.evrichart.com provided funding and loaned equipment
@@ -251,6 +251,8 @@
          - sane_get_params uses intermediate struct instead of user struct
          - if scanner stops, clone the last line until the end of buffer
          - reset some intermediate params between duplex sides
+      v35 2010-02-09, MAN
+         - cleanup #includes and copyright
 
    SANE FLOW DIAGRAM
 
@@ -284,22 +286,10 @@
 
 #include "../include/sane/config.h"
 
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <time.h>
-#include <math.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-#ifdef HAVE_LIBC_H
-# include <libc.h>              /* NeXTStep/OpenStep */
-#endif
+#include <string.h> /*memcpy...*/
+#include <ctype.h> /*isspace*/
+#include <math.h> /*tan*/
+#include <unistd.h> /*usleep*/
 
 #include "../include/sane/sanei_backend.h"
 #include "../include/sane/sanei_scsi.h"
@@ -311,7 +301,7 @@
 #include "canon_dr.h"
 
 #define DEBUG 1
-#define BUILD 34
+#define BUILD 35
 
 /* values for SANE_DEBUG_CANON_DR env var:
  - errors           5

backend/epjitsu.conf.in

@@ -31,3 +31,7 @@ usb 0x04c5 0x1156
 # Fujitsu S300M
 firmware @DATADIR@/sane/epjitsu/300M_0C00.nal
 usb 0x04c5 0x117f
+
+# Fujitsu S1300
+firmware @DATADIR@/sane/epjitsu/1300_0C26.nal
+usb 0x04c5 0x11ed

backend/fujitsu.c

@@ -446,7 +446,7 @@
          - support hardware based auto length detection
       v97 2009-09-14, MAN
          - use sanei_magic to provide software deskew, autocrop and despeckle
-      v98 2010-02-08, MAN
+      v98 2010-02-09, MAN
          - clean up #include lines and copyright
 
    SANE FLOW DIAGRAM

doc/descriptions/canon_dr.desc

@@ -11,9 +11,9 @@
 
 :backend "canon_dr"              ; name of backend
 :url "http://www.thebility.com/canon/" 
-:version "34"                    ; version of backend
+:version "35"                    ; version of backend
 :manpage "sane-canon_dr"         ; name of manpage (if it exists)
-:comment "New backend as of SANE release 1.0.20, testers needed, see manpage"
+:comment "Backend updated for SANE release 1.0.21, see sane-canon_dr manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
@@ -64,6 +64,16 @@
 :status :complete
 :comment "Hardware provides: Gray/Color, Simplex/Duplex, Full-width, 300/600dpi horizontal. Driver provides: Binary, Despeckle, Deskew, Cropping, Calibration, other resolutions."
 
+:model "DR-2010M"
+:interface "USB"
+:status :untested
+:comment "Mac version of DR-2010C? Please test!"
+
+:model "DR-2020U"
+:interface "USB"
+:status :untested
+:comment "Please test!"
+
 :model "DR-2050C"
 :interface "USB"
 :usbid "0x04a9" "0x160a"
@@ -88,6 +98,11 @@
 :status :complete
 :comment "Hardware provides: Gray/Color, Simplex/Duplex, Full-width, 300/600dpi horizontal. Driver provides: Binary, Despeckle, Deskew, Cropping, Calibration, other resolutions"
 
+:model "DR-2510M"
+:interface "USB"
+:status :untested
+:comment "Mac version of DR-2510C? Please test!"
+
 :model "DR-2580C"
 :interface "USB SCSI"
 :usbid "0x04a9" "0x1608"
@@ -224,3 +239,4 @@
 :usbid "0x1083" "0x1618"
 :status :untested
 :comment "Please test!"
+

doc/descriptions/epjitsu.desc

@@ -13,7 +13,7 @@
 :url "http://www.thebility.com/epjitsu/" 
 :version "20"                    ; version of backend
 :manpage "sane-epjitsu"          ; name of manpage (if it exists)
-:comment "See sane-epjitsu manpage"
+:comment "Backend updated for SANE release 1.0.21, see sane-epjitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api

doc/sane-canon_dr.man

@@ -1,4 +1,4 @@
-.TH sane\-canon_dr 5 "30 Jul 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane\-canon_dr 5 "09 Fev 2010" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-canon_dr
 
 .SH NAME
@@ -10,7 +10,7 @@ The
 library implements a SANE (Scanner Access Now Easy) backend which
 provides access to some Canon DR-series scanners.
 
-This document describes backend version 34, which shipped with SANE 1.0.21cvs.
+This document describes backend version 35, which shipped with SANE 1.0.21cvs.
 
 .SH SUPPORTED HARDWARE
 This version has only been tested with a few scanner models. Please see 

doc/sane-epjitsu.man

@@ -1,4 +1,4 @@
-.TH sane\-epjitsu 5 "11 Jul 2008" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane\-epjitsu 5 "09 Feb 2010" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-epjitsu
 
 .SH NAME
@@ -7,7 +7,7 @@ sane\-epjitsu \- SANE backend for Epson-based Fujitsu USB scanners.
 .SH DESCRIPTION
 The 
 .B sane\-epjitsu
-library implements a SANE (Scanner Access Now Easy) backend which provides basic access the Fujitsu fi\-60F and ScanSnap S300 scanners.
+library implements a SANE (Scanner Access Now Easy) backend which provides basic access the Fujitsu fi\-60F and ScanSnap S300/S1300 scanners.
 
 .SH HARDWARE SUPPORT
 These scanners are fairly limited, only supporting a couple of modes and resolutions, and always scanning full width. The backend supports missing modes (binary, grayscale) in software, but makes no effort to offer intermediate resolutions or scan area controls. See 
@@ -87,19 +87,15 @@ The backend uses a single environment variable, SANE_DEBUG_EPJITSU, which enable
 No scan area options are exposed.
 .br
 .br
-No brightness, contrast, or threshold options are exposed.
-.br
-.br
 fi\-60F hardware grayscale mode is not used.
-.br
-.br
-Calibration is far from perfect.
 .RE
 
 .SH CREDITS
 S300 support funded by Microdea, Inc. and Archivista, GmbH.
 .br
 fi\-60F support funded by TrueCheck, Inc.
+.br
+Improved calibration code provided by Richard Goedeken.
 
 .SH "SEE ALSO"
 sane(7),

doc/sane-fujitsu.man

@@ -1,4 +1,4 @@
-.TH sane\-fujitsu 5 "20 Apr 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane\-fujitsu 5 "09 Feb 2010" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-fujitsu
 
 .SH NAME
@@ -10,13 +10,13 @@ The
 library implements a SANE (Scanner Access Now Easy) backend which
 provides access to most Fujitsu flatbed and ADF scanners.
 
-This document describes backend version 95, which shipped with SANE 1.0.21cvs.
+This document describes backend version 98, which shipped with SANE 1.0.21cvs.
 
 .SH SUPPORTED HARDWARE
 This version supports every known model which speaks the Fujitsu SCSI and 
 SCSI\-over\-USB protocols. Specifically, the SCSI M309x and M409x series, the 
-SCSI fi\-series, most of the USB fi\-series, and the USB ScanSnap S5xx scanners 
-are supported. Please see the list at 
+SCSI fi\-series, most of the USB fi\-series, and the USB ScanSnap S5xx/S15xx
+scanners are supported. Please see the list at 
 http://www.sane\-project.org/sane\-supported\-devices.html for details.
 
 This backend may support other Fujitsu scanners. The best
@@ -85,6 +85,14 @@ machines with IPC or DTC will have additional enhancement options, those
 with CMP will have compression options, those with a printer will have a
 group of endorser options.
 
+Additionally, several 'software' options are exposed by the backend. These
+are reimplementations of features provided natively by larger scanners, but
+running on the host computer. This enables smaller machines to have similar
+capabilites. Please note that these features are somewhat simplistic, and 
+may not perform as well as the native implementations. Note also that these 
+features all require that the driver cache the entire image in memory. This 
+will almost certainly result in a reduction of scanning speed.
+
 Use 'scanimage \-\-help' to get a list, but be aware that some options may 
 be settable only when another option has been set, and that advanced options 
 may be hidden by some frontend programs.
@@ -121,7 +129,8 @@ to determine if it is a Fujitsu scanner.
 .PP
 "usb /dev/usb/scanner0" (or other device file)
 .RS
-Some systems use a kernel driver to access usb scanners. This method is untested.
+Some systems use a kernel driver to access usb scanners. This method is
+untested.
 .RE
 .PP
 The only configuration option supported is "buffer\-size=xxx", allowing you
@@ -168,7 +177,7 @@ an override is added to the backend.
 .PP
 CCITT Fax compression used by older scanners is not supported.
 .PP
-Automatic paper size detection (aka auto-cropping) is not supported.
+Hardware automatic paper width detection (aka auto-cropping) is not supported.
 .PP
 JPEG output is supported by the backend, but not by the SANE protocol, so is
 disabled in this release. It can be enabled if you rebuild from source.