epjitsu backend v32

- fix hanging scan when using source = ADF Back (fixes #601)
- minor improvements to .desc and manpage
merge-requests/706/merge
m. allan noah 2022-11-15 22:01:19 -05:00
rodzic eb52b43762
commit 6acd5366cb
3 zmienionych plików z 18 dodań i 14 usunięć

Wyświetl plik

@ -3,7 +3,7 @@
This file implements a SANE backend for the Fujitsu fi-60F, the
ScanSnap S300/S1300, and (hopefully) other Epson-based scanners.
Copyright 2007-2015 by m. allan noah <kitno455 at gmail dot com>
Copyright 2007-2022 by m. allan noah <kitno455 at gmail dot com>
Copyright 2009 by Richard Goedeken <richard at fascinationsoftware dot com>
Development funded by Microdea, Inc., TrueCheck, Inc. and Archivista, GmbH
@ -155,6 +155,8 @@
v31 2017-04-09, MAN
- hardware gray support for fi-60F/65F (disabled pending calibration)
- merge fi-60F/65F settings
v32 2022-11-15, MAN
- fix hanging scan when using source = ADF Back (fixes #601)
SANE FLOW DIAGRAM
@ -203,7 +205,7 @@
#include "epjitsu-cmd.h"
#define DEBUG 1
#define BUILD 31
#define BUILD 32
#ifndef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
@ -4087,12 +4089,12 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len, SANE_Int * len
memcpy(buf, page->image->buffer + page->bytes_read, *len);
page->bytes_read += *len;
}
/* sent it all, return eof on next read */
if(page->bytes_read == page->bytes_scanned && s->fullscan.done){
DBG (10, "sane_read: side done\n");
page->done = 1;
}
/* sent it all, return eof on next read */
if(page->bytes_read == page->bytes_scanned && s->fullscan.done){
DBG (10, "sane_read: side done\n");
page->done = 1;
}
DBG (10, "sane_read: finish si:%d len:%d max:%d\n",s->side,*len,max_len);

Wyświetl plik

@ -10,15 +10,16 @@
;
:backend "epjitsu" ; name of backend
:version "31" ; version of backend
:version "32" ; version of backend
:manpage "sane-epjitsu" ; name of manpage (if it exists)
:comment "Backend updated for SANE release 1.0.26, see sane-epjitsu manpage"
:comment "Backend updated for SANE release 1.1.2, see sane-epjitsu manpage"
:devicetype :scanner ; start of a list of devices....
; other types: :stillcam, :vidcam,
; :meta, :api
:mfg "Fujitsu" ; name a manufacturer
:url "http://www.fujitsu.com/"
:url "https://fujitsuscanners.com/"
;==================================================
:model "fi-60F"

Wyświetl plik

@ -1,4 +1,4 @@
.TH sane\-epjitsu 5 "11 Apr 2017" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.TH sane\-epjitsu 5 "15 Nov 2022" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.IX sane\-epjitsu
.SH NAME
@ -25,22 +25,23 @@ frontend to set resolution, color mode, and choose the ADF setting. The
.B sane\-epjitsu
backend supports the following basic options for most scanners:
.PP
.BR source s
.B source s
.RS
Selects the source for the scan. Options may include "Flatbed", "ADF Front", "ADF Back", "ADF Duplex".
.RE
.PP
.BR mode m
.B mode m
.RS
Selects the mode for the scan. Options may include "Lineart", "Gray", "Color".
.RE
.PP
.BR resolution , y\-resolution
.B resolution, y\-resolution
.RS
Controls scan resolution. Setting
.B \-\-resolution
also sets
.B \-\-y\-resolution, though this behavior is overridden by some frontends.
.B \-\-y\-resolution,
though this behavior is overridden by some frontends.
.RE
.PP
Other options will be available based on the capabilities of the scanner. Use