canon_lide70

adding/modifying twelve files to provide the new canon_lide70 backend
2020-01-04 16:18:57 +01:00 · 2020-01-04 16:18:57 +01:00 · ebd45d4cf8
commit ebd45d4cf8
--- a/1
+++ b/1
@ -17,6 +17,7 @@ Backends:
                Mitsuru Okaniwa, Ulrich Deiters
 canon630u:     Nathan Rutman
 canon_dr:      m. allan noah (*)
+ canon_lide70:  Juergen Ernst, pimvantend
 canon_pp:      Matthew Duggan, Simon Krix
 cardscan:      m. allan noah (*)
 coolscan:      Didier Carlier, Andreas Rick
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@ -65,6 +65,7 @@ EXTRA_DIST += saned.conf.in
 BACKEND_CONFS= abaton.conf agfafocus.conf apple.conf artec.conf \
 	       artec_eplus48u.conf avision.conf bh.conf \
 	       canon630u.conf canon.conf canon_dr.conf \
+               canon_lide70.conf \
 	       canon_pp.conf cardscan.conf coolscan2.conf coolscan3.conf \
 	       coolscan.conf dc210.conf dc240.conf dc25.conf \
 	       dell1600n_net.conf dmc.conf epjitsu.conf epson2.conf \
@ -157,6 +158,7 @@ be_convenience_libs = libabaton.la libagfafocus.la \
    libapple.la libartec.la libartec_eplus48u.la \
    libas6e.la libavision.la libbh.la \
    libcanon.la libcanon630u.la libcanon_dr.la \
+    libcanon_lide70.la \
    libcanon_pp.la libcardscan.la libcoolscan.la \
    libcoolscan2.la libcoolscan3.la libdc25.la \
    libdc210.la libdc240.la libdell1600n_net.la \
@ -190,6 +192,7 @@ be_dlopen_libs = libsane-abaton.la libsane-agfafocus.la \
    libsane-apple.la libsane-artec.la libsane-artec_eplus48u.la \
    libsane-as6e.la libsane-avision.la libsane-bh.la \
    libsane-canon.la libsane-canon630u.la libsane-canon_dr.la \
+    libsane-canon_lide70.la \
    libsane-canon_pp.la libsane-cardscan.la libsane-coolscan.la \
    libsane-coolscan2.la libsane-coolscan3.la libsane-dc25.la \
    libsane-dc210.la libsane-dc240.la libsane-dell1600n_net.la \
@ -344,6 +347,17 @@ 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)
 EXTRA_DIST += canon_dr.conf.in

+libcanon_lide70_la_SOURCES = canon_lide70.c
+libcanon_lide70_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=canon_lide70
+
+nodist_libsane_canon_lide70_la_SOURCES = canon_lide70-s.c
+libsane_canon_lide70_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=canon_lide70
+libsane_canon_lide70_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
+libsane_canon_lide70_la_LIBADD = $(COMMON_LIBS) libcanon_lide70.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)
+EXTRA_DIST += canon_lide70.conf.in
+# TODO: Why are this distributed but not compiled?
+EXTRA_DIST += canon_lide70-common.c
+
 libcanon_pp_la_SOURCES = canon_pp.c canon_pp.h canon_pp-io.c canon_pp-io.h canon_pp-dev.c canon_pp-dev.h
 libcanon_pp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=canon_pp

--- a/backend/canon_lide70-common.c
+++ b/backend/canon_lide70-common.c
--- a/backend/canon_lide70.c
+++ b/backend/canon_lide70.c
--- a/backend/canon_lide70.conf.in
+++ b/backend/canon_lide70.conf.in
@ -1,7 +1,4 @@
-# Options for the canonusb backend
-
-# Autodetect the Canon CanoScan LiDE 600F
-usb 0x04a9 0x2224
+# Options for the canon_lide70 backend

 # Autodetect the Canon CanoScan LiDE 70
 usb 0x04a9 0x2225
--- a/backend/dll.conf.in
+++ b/backend/dll.conf.in
@ -19,6 +19,7 @@ bh
 canon
 canon630u
 canon_dr
+canon_lide70
 #canon_pp
 cardscan
 coolscan
--- a/configure.ac
+++ b/configure.ac
@ -634,7 +634,7 @@ AC_ARG_ENABLE(local-backends,
                 [turn off compilation of all backends but net]))

 ALL_BACKENDS="abaton agfafocus apple artec artec_eplus48u as6e \
-        avision bh canon canon630u canon_dr canon_pp cardscan \
+        avision bh canon canon630u canon_dr canon_lide70 canon_pp cardscan \
        coolscan coolscan2 coolscan3 dc25 dc210 dc240 \
        dell1600n_net dmc epjitsu epson epson2 epsonds escl fujitsu \
        genesys gphoto2 gt68xx hp hp3500 hp3900 hp4200 hp5400 \
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@ -18,6 +18,7 @@ EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
 # custom install/uninstall if we required man pages for every backend.

 BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
+        sane-canon_lide70.5 \
 	sane-dll.5 sane-dc25.5 sane-dmc.5 sane-epson.5 sane-epson2.5 sane-epsonds.5 \
 	sane-escl.5 sane-hp.5 sane-gphoto2.5 sane-leo.5 sane-lexmark.5 \
 	sane-matsushita.5 sane-microtek.5 sane-microtek2.5 sane-mustek.5 \
@ -40,6 +41,7 @@ BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
 	sane-kvs40xx.5 sane-p5.5 sane-magicolor.5

 EXTRA_DIST += sane-abaton.man sane-agfafocus.man sane-apple.man sane-as6e.man \
+        sane-canon_lide70.man \
 	sane-dll.man sane-dc25.man sane-dmc.man sane-epson.man \
 	sane-epson2.man sane-epsonds.man sane-escl.man sane-hp.man sane-gphoto2.man \
 	sane-leo.man sane-lexmark.man sane-matsushita.man sane-microtek.man \
@ -151,6 +153,7 @@ DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.desc \
  descriptions/artec_eplus48u.desc descriptions/as6e.desc \
  descriptions/avision.desc descriptions/bh.desc descriptions/canon630u.desc \
  descriptions/canon.desc descriptions/canon_dr.desc \
+  descriptions/canon_lide70.desc \
  descriptions/canon_pp.desc descriptions/cardscan.desc \
  descriptions/coolscan2.desc descriptions/coolscan.desc \
  descriptions/coolscan3.desc \
--- a/doc/descriptions/canon_lide70.desc
+++ b/doc/descriptions/canon_lide70.desc
@ -9,12 +9,10 @@
 ; All other information is optional (but what good is the file without it?).
 ;

-:backend "canon_lide"             ; name of backend
-:manpage "sane-canon_lide"
-:version "0.1"                    ; version of backend
-;:status :beta
-:url "http://www.juergen-ernst.de/info_sane.html" ; backend home page
-
+:backend "canon_lide70"          ; name of backend
+:url "http://www.juergen-ernst.de/info_sane.html"
+:version "0"                     ; version of backend
+:manpage "sane-canon_lide70"     ; name of manpage (if it exists)
 :devicetype :scanner             ; start of a list of devices....
                                 ; other types:  :stillcam, :vidcam,
                                 ;               :meta, :api
@ -22,17 +20,10 @@
 :mfg "Canon"               ; name a manufacturer
 :url "http://www.canon.com/"

-:model "CanoScan LiDE 600F"       ; name models for above-specified mfg.
-:interface "USB"
-:usbid "0x04a9" "0x2224"
-:comment "Testing"
-:status :basic
-
-:model "CanoScan LiDE 70"         ; name models for above-specified mfg.
+;==================================================
+:model "CanoScan LiDE 70"
 :interface "USB"
 :usbid "0x04a9" "0x2225"
-:comment "Testing"
 :status :basic
+:comment "Please test!"

-; :comment and :url specifiers are optional after :mfg, :model, :desc,
-;  and at the top-level.
--- a/doc/descriptions/unsupported.desc
+++ b/doc/descriptions/unsupported.desc
@ -395,13 +395,6 @@
 :status :unsupported
 :comment "Not supported. However, a stand-alone program for FreeBSD is available."

-:model "CanoScan LiDE 70"
-:url "http://www.juergen-ernst.de/info_sane.html"
-:interface "USB"
-:usbid "0x04a9" "0x2225"
-:status :unsupported
-:comment "Philips chip. Backend started, see link"
-
 :model "CanoScan LiDE 90"
 :url "unsupported/canon-lide-90.html"
 :interface "USB"
--- a/doc/sane-canon_lide70.man
+++ b/doc/sane-canon_lide70.man
@ -0,0 +1,105 @@
+.TH sane\-canon_lide70 5 "26 Nov 2019"  "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.IX sane\-canon_lide70
+.SH NAME
+sane\-canon_lide70 \- SANE backend for the Canon LiDE 70 USB flatbed scanner
+.SH DESCRIPTION
+The
+.B canon_lide70
+library implements a SANE (Scanner Access Now Easy) backend that
+provides access to the Canon Inc. CanoScan LiDE 70 flatbed scanner.
+.PP
+Due to Canon's unwillingness to provide scanner documentation, this
+software was developed by analyzing the USB traffic of the Windows
+XP driver. The precise meaning of the individual commands that are sent
+to the scanner is known only to a very limited extent. Some sophistication
+present in the Windows XP driver has been left out. There is, for example,
+no active calibration.
+.PP
+TESTERS ARE WELCOME. Send your bug reports and comments to
+the sane\-devel mailing list <sane\-devel@alioth-lists.debian.net>
+.PP
+The
+.B Canoscan LiDE 600
+(or 600f, with film unit) is closely related to the LiDE 70, but
+it probably will not work with this backend. The framework of this canon_lide70
+backend could likely be used to develop a backend for the LiDE 600 without too
+much difficulty.
+.PP
+.SH CONFIGURATION
+The
+.I @CONFIGDIR@/canon_lide70.conf
+file identifies the LiDE 70 by its vendor code 0x04a9 and its
+product code 0x2225. For the LiDE 600(f) the product code would be 0x2224.
+.PP
+.SH BACKEND SPECIFIC OPTIONS
+.PP
+.B Scan Mode:
+.TP
+\-\-resolution 75|150|300|600|1200 [default 600]
+.BR
+Sets the resolution of the scanned image in dots per inch. Scanning at 1200 dpi is very slow.
+.TP
+\-\-mode Color|Gray|Lineart [default: Color]
+.BR
+Selects the scan mode. Lineart means fully black and fully white pixels only.
+.TP
+\-\-threshold 0..100 (in steps of 1) [default 75]
+.BR
+Select minimum-brightness percentage to get a white point, relevant only for Lineart
+.TP
+\-\-non-blocking[=(yes|no)] [inactive]
+.BR
+This option has not yet been implemented. Scans are captured in a temporary file with a typical size of 100MB.
+.PP
+.B Geometry:
+.TP
+\-l 0..216.069 [default 0]
+        Top-left x position of scan area in millimeters.
+.TP
+\-t 0..297 [default 0]
+        Top-left y position of scan area in millimeters.
+.TP
+\-x 0..216.069 [default 80]
+        Width of scan-area in millimeters.
+.TP
+\-y 0..297 [default 100]
+        Height of scan-area in millimeters.
+.PP
+.SH FILES
+.TP
+.I @CONFIGDIR@/canon_lide70.conf
+The backend configuration file
+.TP
+.I @LIBDIR@/libsane\-canon_lide70.a
+The static library implementing this backend.
+.TP
+.I @LIBDIR@/libsane\-canon_lide70.so
+The shared library implementing this backend (present on systems that
+support dynamic loading).
+.SH ENVIRONMENT
+.TP
+.B SANE_DEBUG_CANON_LIDE70
+If the library was compiled with debug support enabled, this
+environment variable controls the debug level for this backend.  Higher
+debug levels increase the verbosity of the output.
+
+Example:
+.br
+SANE_DEBUG_CANON_LIDE70=128 scanimage > /dev/null
+.SH KNOWN PROBLEMS
+At low resolutions (75 and 150 dpi, implying high slider speeds)
+the scanner misses the top one millimeter of the scan area. This can
+be remedied by shifting the document one millimeter downward, in cases
+where such precision matters. Note that xsane uses the 75 dpi mode for
+prescans.
+.PP
+It is recommended that in xsane the gamma value be set to approximately 2.0
+to get more realistic colors. This also wipes out some artifacts caused by
+the lack of real calibration.
+.SH "SEE ALSO"
+sane(7), sane\-usb(5), sane\-find\-scanner(1), scanimage(1)
+.br
+http://www.juergen-ernst.de/info_sane.html
+.br
+.SH AUTHOR
+pimvantend, building upon pioneering work by Juergen Ernst.
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -14,6 +14,8 @@ backend/canon-sane.c
 backend/canon_dr.c
 backend/canon_dr.h

+backend/canon_lide70.c
+
 backend/cardscan.c
 backend/cardscan.h