merge-requests/1/head
Mattias Ellert 2005-04-28 12:49:01 +00:00
rodzic 3f893c5e03
commit 23b39a25f1
2 zmienionych plików z 11 dodań i 5 usunięć

Wyświetl plik

@ -1,3 +1,7 @@
2005-04-28 Mattias Ellert <mattias.ellert@tsl.uu.se>
* frontend/scanimage.c: Added missing braces
2005-04-27 Gerhard Jaeger <gerhard@gjaeger.de> 2005-04-27 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/descriptions/plustek.desc: Added UMAX Astranet ia101. * doc/descriptions/plustek.desc: Added UMAX Astranet ia101.
@ -64,7 +68,7 @@
sanei_usb_claim_interface sanei_usb_claim_interface
sanei_usb_release_interface sanei_usb_release_interface
sanei_usb_set_altinterface sanei_usb_set_altinterface
* frontend/scanimage.c added -B option buf size * frontend/scanimage.c added -B option buf size
split up printf command to remove warning ISO C89 split up printf command to remove warning ISO C89
patch for bugreport 300160, ranges for width and height are wrong patch for bugreport 300160, ranges for width and height are wrong
* doc/scanimage.man added text -B option buf size * doc/scanimage.man added text -B option buf size

Wyświetl plik

@ -1786,7 +1786,8 @@ main (int argc, char **argv)
} }
if (help) if (help)
printf ("Usage: %s [OPTION]...\n\ {
printf ("Usage: %s [OPTION]...\n\
\n\ \n\
Start image acquisition on a scanner device and write PNM image data to\n\ Start image acquisition on a scanner device and write PNM image data to\n\
standard output.\n\ standard output.\n\
@ -1794,14 +1795,14 @@ standard output.\n\
-d, --device-name=DEVICE use a given scanner device (e.g. hp:/dev/scanner)\n\ -d, --device-name=DEVICE use a given scanner device (e.g. hp:/dev/scanner)\n\
--format=pnm|tiff file format of output file\n\ --format=pnm|tiff file format of output file\n\
-i, --icc-profile=PROFILE include this ICC profile into TIFF file\n", prog_name); -i, --icc-profile=PROFILE include this ICC profile into TIFF file\n", prog_name);
printf ("\ printf ("\
-L, --list-devices show available scanner devices\n\ -L, --list-devices show available scanner devices\n\
-f, --formatted-device-list=FORMAT similar to -L, but the FORMAT of the output\n\ -f, --formatted-device-list=FORMAT similar to -L, but the FORMAT of the output\n\
can be specified: %%d (device name), %%v (vendor),\n\ can be specified: %%d (device name), %%v (vendor),\n\
%%m (model), %%t (type), and %%i (index number)\n\ %%m (model), %%t (type), and %%i (index number)\n\
-b, --batch[=FORMAT] working in batch mode, FORMAT is `out%%d.pnm' or\n\ -b, --batch[=FORMAT] working in batch mode, FORMAT is `out%%d.pnm' or\n\
`out%%d.tif' by default depending on --format\n"); `out%%d.tif' by default depending on --format\n");
printf ("\ printf ("\
--batch-start=# page number to start naming files with\n\ --batch-start=# page number to start naming files with\n\
--batch-count=# how many pages to scan in batch mode\n\ --batch-count=# how many pages to scan in batch mode\n\
--batch-increment=# increase number in filename by an amount of #\n\ --batch-increment=# increase number in filename by an amount of #\n\
@ -1809,13 +1810,14 @@ standard output.\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\ --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");
printf ("\ printf ("\
-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\
-h, --help display this help message and exit\n\ -h, --help display this help message and exit\n\
-v, --verbose give even more status messages\n\ -v, --verbose give even more status messages\n\
-B, --buffer-size change default input buffersize\n\ -B, --buffer-size change default input buffersize\n\
-V, --version print version information\n"); -V, --version print version information\n");
}
if (!devname) if (!devname)
{ {