Merge changes Ic389aaa2,I329ccd79 into main

* changes:
  img2webp: normalize help output
  cwebp: reflow -near_lossless help text
This commit is contained in:
James Zern 2023-03-20 19:46:23 +00:00 committed by Gerrit Code Review
commit a4f0483579
4 changed files with 11 additions and 12 deletions

View File

@ -82,8 +82,8 @@ Options:
green=0xe0 and blue=0xd0 green=0xe0 and blue=0xd0
-noalpha ............... discard any transparency information -noalpha ............... discard any transparency information
-lossless .............. encode image losslessly, default=off -lossless .............. encode image losslessly, default=off
-near_lossless <int> ... use near-lossless image -near_lossless <int> ... use near-lossless image preprocessing
preprocessing (0..100=off), default=100 (0..100=off), default=100
-hint <string> ......... specify image characteristics hint, -hint <string> ......... specify image characteristics hint,
one of: photo, picture or graph one of: photo, picture or graph
@ -295,14 +295,13 @@ etc.
Usage: Usage:
```shell ```shell
img2webp [file_options] [[frame_options] frame_file]... img2webp [file_options] [[frame_options] frame_file]... [-o webp_file]
``` ```
File-level options (only used at the start of compression): File-level options (only used at the start of compression):
``` ```
-min_size ............ minimize size -min_size ............ minimize size
-loop <int> .......... loop count (default: 0, = infinite loop)
-kmax <int> .......... maximum number of frame between key-frames -kmax <int> .......... maximum number of frame between key-frames
(0=only keyframes) (0=only keyframes)
-kmin <int> .......... minimum number of frame between key-frames -kmin <int> .......... minimum number of frame between key-frames
@ -312,6 +311,7 @@ File-level options (only used at the start of compression):
(0..100=off), default=100 (0..100=off), default=100
-sharp_yuv ........... use sharper (and slower) RGB->YUV conversion -sharp_yuv ........... use sharper (and slower) RGB->YUV conversion
(lossy only) (lossy only)
-loop <int> .......... loop count (default: 0, = infinite loop)
-v ................... verbose mode -v ................... verbose mode
-h ................... this help -h ................... this help
-version ............. print version number and exit -version ............. print version number and exit

View File

@ -592,9 +592,8 @@ static void HelpLong(void) {
" green=0xe0 and blue=0xd0\n"); " green=0xe0 and blue=0xd0\n");
printf(" -noalpha ............... discard any transparency information\n"); printf(" -noalpha ............... discard any transparency information\n");
printf(" -lossless .............. encode image losslessly, default=off\n"); printf(" -lossless .............. encode image losslessly, default=off\n");
printf(" -near_lossless <int> ... use near-lossless image\n" printf(" -near_lossless <int> ... use near-lossless image preprocessing\n"
" preprocessing (0..100=off), " " (0..100=off), default=100\n");
"default=100\n");
printf(" -hint <string> ......... specify image characteristics hint,\n"); printf(" -hint <string> ......... specify image characteristics hint,\n");
printf(" one of: photo, picture or graph\n"); printf(" one of: photo, picture or graph\n");

View File

@ -36,12 +36,11 @@
static void Help(void) { static void Help(void) {
printf("Usage:\n\n"); printf("Usage:\n\n");
printf(" img2webp [file_options] [[frame_options] frame_file]...\n"); printf(" img2webp [file_options] [[frame_options] frame_file]...");
printf("\n"); printf(" [-o webp_file]\n\n");
printf("File-level options (only used at the start of compression):\n"); printf("File-level options (only used at the start of compression):\n");
printf(" -min_size ............ minimize size\n"); printf(" -min_size ............ minimize size\n");
printf(" -loop <int> .......... loop count (default: 0, = infinite loop)\n");
printf(" -kmax <int> .......... maximum number of frame between key-frames\n" printf(" -kmax <int> .......... maximum number of frame between key-frames\n"
" (0=only keyframes)\n"); " (0=only keyframes)\n");
printf(" -kmin <int> .......... minimum number of frame between key-frames\n" printf(" -kmin <int> .......... minimum number of frame between key-frames\n"
@ -52,6 +51,7 @@ static void Help(void) {
printf(" -sharp_yuv ........... use sharper (and slower) RGB->YUV " printf(" -sharp_yuv ........... use sharper (and slower) RGB->YUV "
"conversion\n " "conversion\n "
"(lossy only)\n"); "(lossy only)\n");
printf(" -loop <int> .......... loop count (default: 0, = infinite loop)\n");
printf(" -v ................... verbose mode\n"); printf(" -v ................... verbose mode\n");
printf(" -h ................... this help\n"); printf(" -h ................... this help\n");
printf(" -version ............. print version number and exit\n"); printf(" -version ............. print version number and exit\n");

View File

@ -1,10 +1,10 @@
.\" Hey, EMACS: -*- nroff -*- .\" Hey, EMACS: -*- nroff -*-
.TH IMG2WEBP 1 "March 16, 2023" .TH IMG2WEBP 1 "March 17, 2023"
.SH NAME .SH NAME
img2webp \- create animated WebP file from a sequence of input images. img2webp \- create animated WebP file from a sequence of input images.
.SH SYNOPSIS .SH SYNOPSIS
.B img2webp .B img2webp
[file_options] [[frame_options] frame_file]... [file_options] [[frame_options] frame_file]... [\-o webp_file]
.br .br
.B img2webp argument_file_name .B img2webp argument_file_name
.br .br