mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Align JPEG format command-line option behaviour with TIFF

merge-requests/1/head
Olaf Meeuwissen 2015-09-18 21:39:25 +09:00 zatwierdzone przez m. allan noah
rodzic bc698d4329
commit 002fea134a
2 zmienionych plików z 3 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
doc/scanimage.man
Wyświetl plik

@ -105,7 +105,7 @@ option selects how image data is written to standard output.
can be can be
.B pnm tiff png .B pnm tiff png
or or
.BR jpg. .BR jpeg.
If If
.B \-\-format .B \-\-format
is not used, PNM is written. is not used, PNM is written.

4
frontend/scanimage.c
Wyświetl plik

@ -2015,7 +2015,7 @@ main (int argc, char **argv)
exit(1); exit(1);
#endif #endif
} }
else if (strcmp (optarg, "jpg") == 0) else if (strcmp (optarg, "jpeg") == 0)
{ {
#ifdef HAVE_LIBJPEG #ifdef HAVE_LIBJPEG
output_format = OUTPUT_JPEG; output_format = OUTPUT_JPEG;
@ -2162,7 +2162,7 @@ standard output.\n\
Parameters are separated by a blank from single-character options (e.g.\n\ Parameters are separated by a blank from single-character options (e.g.\n\
-d epson) and by a \"=\" from multi-character options (e.g. --device-name=epson).\n\ -d epson) and by a \"=\" from multi-character options (e.g. --device-name=epson).\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|png|jpg file format of output file\n\ --format=pnm|tiff|png|jpeg 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\