kopia lustrzana https://gitlab.com/sane-project/backends
Added support for asking for pressing a key before scanning a page in a batch
scan. Patch from Dominik Fischer <dom_fischer@web.de>.merge-requests/1/head
rodzic
a15136f82b
commit
a2e686d667
|
@ -1,3 +1,9 @@
|
||||||
|
2004-02-22 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||||
|
|
||||||
|
* doc/scanimage.man frontend/scanimage.c: Added support for asking
|
||||||
|
for pressing a key before scanning a page in a batch scan. Patch
|
||||||
|
from Dominik Fischer <dom_fischer@web.de>.
|
||||||
|
|
||||||
2004-02-20 Oliver Schirrmeister <oschirr@abm.de>
|
2004-02-20 Oliver Schirrmeister <oschirr@abm.de>
|
||||||
|
|
||||||
* backend/fujitsu.c backend/fujitsu.h backend/fujitsu-scsi.h:
|
* backend/fujitsu.c backend/fujitsu.h backend/fujitsu-scsi.h:
|
||||||
|
@ -11,8 +17,8 @@
|
||||||
* backend/umax_pp_low.h backend/umax_pp_low.c backend/umax_pp.conf
|
* backend/umax_pp_low.h backend/umax_pp_low.c backend/umax_pp.conf
|
||||||
backend/umax_pp.c tools/umax_pp.c: added initial ECP support for
|
backend/umax_pp.c tools/umax_pp.c: added initial ECP support for
|
||||||
scanner, laid groundwork for 610P support.
|
scanner, laid groundwork for 610P support.
|
||||||
|
|
||||||
* backend/mustek_pp_ccd300.c: forgot parameters to wait_bank_change
|
* backend/mustek_pp_ccd300.c: forgot parameters to wait_bank_change
|
||||||
|
|
||||||
2004-02-14 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
2004-02-14 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||||
|
|
||||||
* doc/descriptions/unsupported.desc: Added HP ScanJet 4670 and
|
* doc/descriptions/unsupported.desc: Added HP ScanJet 4670 and
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
.TH scanimage 1 "15 Apr 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
|
.TH scanimage 1 "22 Feb 2004" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
|
||||||
.IX scanimage
|
.IX scanimage
|
||||||
.SH NAME
|
.SH NAME
|
||||||
scanimage \- scan an image
|
scanimage \- scan an image
|
||||||
|
@ -175,6 +175,9 @@ on a single-sided document feeder. A specific command is provided to
|
||||||
aid this:
|
aid this:
|
||||||
.B \-\-batch-double
|
.B \-\-batch-double
|
||||||
will automatically set the increment to 2.
|
will automatically set the increment to 2.
|
||||||
|
.B \-\-batch-prompt
|
||||||
|
will ask for pressing RETURN before scanning a page. This can be used for
|
||||||
|
scanning multiple pages without an automatic document feeder.
|
||||||
.PP
|
.PP
|
||||||
The
|
The
|
||||||
.B \-\-accept-md5-only
|
.B \-\-accept-md5-only
|
||||||
|
|
|
@ -70,6 +70,7 @@ Image;
|
||||||
#define OPTION_BATCH_START_AT 1004
|
#define OPTION_BATCH_START_AT 1004
|
||||||
#define OPTION_BATCH_DOUBLE 1005
|
#define OPTION_BATCH_DOUBLE 1005
|
||||||
#define OPTION_BATCH_INCREMENT 1006
|
#define OPTION_BATCH_INCREMENT 1006
|
||||||
|
#define OPTION_BATCH_PROMPT 1007
|
||||||
|
|
||||||
#define BATCH_COUNT_UNLIMITED -1
|
#define BATCH_COUNT_UNLIMITED -1
|
||||||
|
|
||||||
|
@ -86,6 +87,7 @@ static struct option basic_options[] = {
|
||||||
{"batch-start", required_argument, NULL, OPTION_BATCH_START_AT},
|
{"batch-start", required_argument, NULL, OPTION_BATCH_START_AT},
|
||||||
{"batch-double", no_argument, NULL, OPTION_BATCH_DOUBLE},
|
{"batch-double", no_argument, NULL, OPTION_BATCH_DOUBLE},
|
||||||
{"batch-increment", required_argument, NULL, OPTION_BATCH_INCREMENT},
|
{"batch-increment", required_argument, NULL, OPTION_BATCH_INCREMENT},
|
||||||
|
{"batch-prompt", no_argument, NULL, OPTION_BATCH_PROMPT},
|
||||||
{"format", required_argument, NULL, OPTION_FORMAT},
|
{"format", required_argument, NULL, OPTION_FORMAT},
|
||||||
{"accept-md5-only", no_argument, NULL, OPTION_MD5},
|
{"accept-md5-only", no_argument, NULL, OPTION_MD5},
|
||||||
{"icc-profile", required_argument, NULL, 'i'},
|
{"icc-profile", required_argument, NULL, 'i'},
|
||||||
|
@ -1466,7 +1468,10 @@ main (int argc, char **argv)
|
||||||
const char *devname = 0;
|
const char *devname = 0;
|
||||||
const char *defdevname = 0;
|
const char *defdevname = 0;
|
||||||
const char *format = 0;
|
const char *format = 0;
|
||||||
|
char readbuf[2];
|
||||||
|
char *readbuf2;
|
||||||
int batch = 0;
|
int batch = 0;
|
||||||
|
int batch_prompt = 0;
|
||||||
int batch_count = BATCH_COUNT_UNLIMITED;
|
int batch_count = BATCH_COUNT_UNLIMITED;
|
||||||
int batch_start_at = 1;
|
int batch_start_at = 1;
|
||||||
int batch_increment = 1;
|
int batch_increment = 1;
|
||||||
|
@ -1520,6 +1525,9 @@ main (int argc, char **argv)
|
||||||
case 'n':
|
case 'n':
|
||||||
dont_scan = 1;
|
dont_scan = 1;
|
||||||
break;
|
break;
|
||||||
|
case OPTION_BATCH_PROMPT:
|
||||||
|
batch_prompt = 1;
|
||||||
|
break;
|
||||||
case OPTION_BATCH_INCREMENT:
|
case OPTION_BATCH_INCREMENT:
|
||||||
batch_increment = atoi (optarg);
|
batch_increment = atoi (optarg);
|
||||||
break;
|
break;
|
||||||
|
@ -1692,6 +1700,7 @@ standard output.\n\
|
||||||
--batch-increment=# increase number in filename by an amount of #\n\
|
--batch-increment=# increase number in filename by an amount of #\n\
|
||||||
--batch-double increment page number by two for 2sided originals\n\
|
--batch-double increment page number by two for 2sided originals\n\
|
||||||
being scanned in a single sided scanner\n\
|
being scanned in a single sided scanner\n\
|
||||||
|
--batch-prompt ask for pressing a key before scanning a page\n\
|
||||||
--accept-md5-only only accept authorization requests using md5\n\
|
--accept-md5-only only accept authorization requests using md5\n\
|
||||||
-n, --dont-scan only set options, don't actually scan\n\
|
-n, --dont-scan only set options, don't actually scan\n\
|
||||||
-T, --test test backend thoroughly\n\
|
-T, --test test backend thoroughly\n\
|
||||||
|
@ -1970,6 +1979,12 @@ List of available devices:", prog_name);
|
||||||
|
|
||||||
if (batch)
|
if (batch)
|
||||||
{
|
{
|
||||||
|
if (batch_prompt)
|
||||||
|
{
|
||||||
|
fprintf (stderr, "Place document no. %d on the scanner.\n", n);
|
||||||
|
fprintf (stderr, "Press <RETURN> to continue.\n");
|
||||||
|
readbuf2=fgets(readbuf, 2, stdin);
|
||||||
|
}
|
||||||
fprintf (stderr, "Scanning page %d\n", n);
|
fprintf (stderr, "Scanning page %d\n", n);
|
||||||
}
|
}
|
||||||
status = scan_it ();
|
status = scan_it ();
|
||||||
|
|
Ładowanie…
Reference in New Issue