dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-26 13:48:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "allow 'cwebp -o -' to emit output to stdout"

Browse Source
This commit is contained in:
James Zern 2014-03-12 14:01:15 -07:00 committed by Gerrit Code Review
commit 24ca3678f9
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
examples/cwebp.c
View File

@ -310,18 +310,18 @@ static void PrintMapInfo(const WebPPicture* const pic) {
for (x = 0; x < mb_w; ++x) {
const int c = pic->extra_info[x + y * mb_w];
if (type == 1) { // intra4/intra16
printf("%c", "+."[c]);
fprintf(stderr, "%c", "+."[c]);
} else if (type == 2) { // segments
printf("%c", ".-*X"[c]);
fprintf(stderr, "%c", ".-*X"[c]);
} else if (type == 3) { // quantizers
printf("%.2d ", c);
fprintf(stderr, "%.2d ", c);
} else if (type == 6 || type == 7) {
printf("%3d ", c);
fprintf(stderr, "%3d ", c);
} else {
printf("0x%.2x ", c);
fprintf(stderr, "0x%.2x ", c);
}
}
printf("\n");
fprintf(stderr, "\n");
}
}
}
@ -534,9 +534,8 @@ static int WriteWebPWithMetadata(FILE* const out,
//------------------------------------------------------------------------------
static int ProgressReport(int percent, const WebPPicture* const picture) {
printf("[%s]: %3d %% \r",
(char*)picture->user_data, percent);
fflush(stdout);
fprintf(stderr, "[%s]: %3d %% \r",
(char*)picture->user_data, percent);
return 1; // all ok
}
@ -975,8 +974,9 @@ int main(int argc, const char *argv[]) {
}
// Open the output
if (out_file) {
out = fopen(out_file, "wb");
if (out_file != NULL) {
const int use_stdout = !strcmp(out_file, "-");
out = use_stdout ? stdout : fopen(out_file, "wb");
if (out == NULL) {
fprintf(stderr, "Error! Cannot open output file '%s'\n", out_file);
goto Error;
@ -1126,7 +1126,7 @@ int main(int argc, const char *argv[]) {
MetadataFree(&metadata);
WebPPictureFree(&picture);
WebPPictureFree(&original_picture);
if (out != NULL) {
if (out != NULL && out != stdout) {
fclose(out);
}

6
man/cwebp.1
View File

@ -19,6 +19,12 @@ The basic options are:
.BI \-o " string
Specify the name of the output WebP file. If omitted, \fBcwebp\fP will
perform compression but only report statistics.
Using "\-" as output name will direct output to 'stdout'.
.TP
.BI \-\- " string
Explicitly specify the input file. This option is useful if the input
file starts with an '\-' for instance. This option must appear \fBlast\fP.
Any other options afterward will be ignored.
.TP
.B \-h, \-help
A short usage summary.