Merge changes I994a5587,I8467bb71,I13b50688,I1e2c9c7b

* changes:
  gif2webp: let -- stop parameter parsing
  vwebp: let -- stop parameter parsing
  cwebp: let -- stop parameter parsing
  dwebp: let -- stop parameter parsing
This commit is contained in:
James Zern 2013-12-16 16:53:27 -08:00 committed by Gerrit Code Review
commit 7f9de0b948
7 changed files with 21 additions and 3 deletions

View File

@ -895,6 +895,9 @@ int main(int argc, const char *argv[]) {
#endif #endif
} else if (!strcmp(argv[c], "-v")) { } else if (!strcmp(argv[c], "-v")) {
verbose = 1; verbose = 1;
} else if (!strcmp(argv[c], "--")) {
if (c < argc - 1) in_file = argv[++c];
break;
} else if (argv[c][0] == '-') { } else if (argv[c][0] == '-') {
fprintf(stderr, "Error! Unknown option '%s'\n", argv[c]); fprintf(stderr, "Error! Unknown option '%s'\n", argv[c]);
HelpLong(); HelpLong();

View File

@ -649,6 +649,9 @@ int main(int argc, const char *argv[]) {
#endif #endif
} else if (!strcmp(argv[c], "-incremental")) { } else if (!strcmp(argv[c], "-incremental")) {
incremental = 1; incremental = 1;
} else if (!strcmp(argv[c], "--")) {
if (c < argc - 1) in_file = argv[++c];
break;
} else if (argv[c][0] == '-') { } else if (argv[c][0] == '-') {
fprintf(stderr, "Unknown option '%s'\n", argv[c]); fprintf(stderr, "Unknown option '%s'\n", argv[c]);
Help(); Help();

View File

@ -359,6 +359,9 @@ int main(int argc, const char *argv[]) {
quiet = 1; quiet = 1;
} else if (!strcmp(argv[c], "-v")) { } else if (!strcmp(argv[c], "-v")) {
verbose = 1; verbose = 1;
} else if (!strcmp(argv[c], "--")) {
if (c < argc - 1) in_file = argv[++c];
break;
} else if (argv[c][0] == '-') { } else if (argv[c][0] == '-') {
fprintf(stderr, "Error! Unknown option '%s'\n", argv[c]); fprintf(stderr, "Error! Unknown option '%s'\n", argv[c]);
Help(); Help();

View File

@ -425,6 +425,9 @@ int main(int argc, char *argv[]) {
return 0; return 0;
} else if (!strcmp(argv[c], "-mt")) { } else if (!strcmp(argv[c], "-mt")) {
config->options.use_threads = 1; config->options.use_threads = 1;
} else if (!strcmp(argv[c], "--")) {
if (c < argc - 1) kParams.file_name = argv[++c];
break;
} else if (argv[c][0] == '-') { } else if (argv[c][0] == '-') {
printf("Unknown option '%s'\n", argv[c]); printf("Unknown option '%s'\n", argv[c]);
Help(); Help();

View File

@ -1,5 +1,5 @@
.\" Hey, EMACS: -*- nroff -*- .\" Hey, EMACS: -*- nroff -*-
.TH CWEBP 1 "October 23, 2013" .TH CWEBP 1 "December 12, 2013"
.SH NAME .SH NAME
cwebp \- compress an image file to a WebP file cwebp \- compress an image file to a WebP file
.SH SYNOPSIS .SH SYNOPSIS
@ -255,6 +255,8 @@ cwebp \-q 50 -lossless picture.png \-o picture_lossless.webp
cwebp \-q 70 picture_with_alpha.png \-o picture_with_alpha.webp cwebp \-q 70 picture_with_alpha.png \-o picture_with_alpha.webp
.br .br
cwebp \-sns 70 \-f 50 \-size 60000 picture.png \-o picture.webp cwebp \-sns 70 \-f 50 \-size 60000 picture.png \-o picture.webp
.br
cwebp \-o picture.webp \-\- \-\-\-picture.png
.SH AUTHORS .SH AUTHORS
\fBcwebp\fP was written by the WebP team. \fBcwebp\fP was written by the WebP team.

View File

@ -1,5 +1,5 @@
.\" Hey, EMACS: -*- nroff -*- .\" Hey, EMACS: -*- nroff -*-
.TH DWEBP 1 "November 26, 2013" .TH DWEBP 1 "December 12, 2013"
.SH NAME .SH NAME
dwebp \- decompress a WebP file to an image file dwebp \- decompress a WebP file to an image file
.SH SYNOPSIS .SH SYNOPSIS
@ -99,6 +99,8 @@ http://www.webmproject.org/code/contribute/submitting-patches/
dwebp picture.webp \-o output.png dwebp picture.webp \-o output.png
.br .br
dwebp picture.webp \-ppm \-o output.ppm dwebp picture.webp \-ppm \-o output.ppm
.br
dwebp \-o output.ppm \-\- \-\-\-picture.webp
.SH AUTHORS .SH AUTHORS
\fBdwebp\fP was written by the WebP team. \fBdwebp\fP was written by the WebP team.

View File

@ -1,5 +1,5 @@
.\" Hey, EMACS: -*- nroff -*- .\" Hey, EMACS: -*- nroff -*-
.TH GIF2WEBP 1 "November 18, 2013" .TH GIF2WEBP 1 "December 12, 2013"
.SH NAME .SH NAME
gif2webp \- Convert a GIF image to WebP gif2webp \- Convert a GIF image to WebP
.SH SYNOPSIS .SH SYNOPSIS
@ -119,6 +119,8 @@ gif2webp \-q 70 picture.gif \-o picture.webp
gif2webp \-lossy \-m 3 picture.gif \-o picture_lossy.webp gif2webp \-lossy \-m 3 picture.gif \-o picture_lossy.webp
.br .br
gif2webp \-lossy \-f 50 picture.gif \-o picture.webp gif2webp \-lossy \-f 50 picture.gif \-o picture.webp
.br
gif2webp \-q 70 \-o picture.webp \-\- \-\-\-picture.gif
.SH AUTHORS .SH AUTHORS
\fBgif2webp\fP was written by the WebP team. \fBgif2webp\fP was written by the WebP team.