From 38369c03e0f2459328a6447d6e395bc1914cfa11 Mon Sep 17 00:00:00 2001 From: Pascal Massimino Date: Wed, 4 May 2011 22:59:51 -0700 Subject: [PATCH] cosmetics Change-Id: I39c3bc671ab427dcb3e23aedee7fe8d81f4cb860 --- examples/cwebp.c | 18 ++++++++++++------ src/enc/picture.c | 3 ++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/examples/cwebp.c b/examples/cwebp.c index e564fa3a..ea179abd 100644 --- a/examples/cwebp.c +++ b/examples/cwebp.c @@ -603,6 +603,8 @@ static void HelpLong(void) { printf("\n"); printf(" -m ............... compression method (0=fast, 6=slowest)\n"); printf(" -segments ........ number of segments to use (1..4)\n"); + printf(" -size ............ Target size (in bytes)\n"); + printf(" -psnr .......... Target PSNR (in dB. typically: 42)\n"); printf("\n"); printf(" -s ......... Input size (width x height) for YUV\n"); printf(" -sns ............. Spatial Noise Shaping (0:off, 100:max)\n"); @@ -630,8 +632,6 @@ static void HelpLong(void) { "times\n"); printf("\n"); printf("Experimental Options:\n"); - printf(" -size ............ Target size (in bytes)\n"); - printf(" -psnr .......... Target PSNR (in dB. typically: 42)\n"); printf(" -af .................... auto-adjust filter strength.\n"); printf(" -pre ............. pre-processing filter\n"); printf("\n"); @@ -780,8 +780,9 @@ int main(int argc, const char *argv[]) { } // Read the input - if (verbose) + if (verbose) { StopwatchReadAndReset(&stop_watch); + } if (!ReadPicture(in_file, &picture, keep_alpha)) { fprintf(stderr, "Error! Cannot read input picture\n"); goto Error; @@ -814,8 +815,9 @@ int main(int argc, const char *argv[]) { picture.stats = &stats; // Compress - if (verbose) + if (verbose) { StopwatchReadAndReset(&stop_watch); + } if (crop != 0 && !WebPPictureCrop(&picture, crop_x, crop_y, crop_w, crop_h)) { fprintf(stderr, "Error! Cannot crop picture\n"); goto Error; @@ -839,8 +841,12 @@ int main(int argc, const char *argv[]) { } // Write info - if (dump_file) DumpPicture(&picture, dump_file); - if (!quiet) PrintExtraInfo(&picture, short_output); + if (dump_file) { + DumpPicture(&picture, dump_file); + } + if (!quiet) { + PrintExtraInfo(&picture, short_output); + } Error: free(picture.extra_info); diff --git a/src/enc/picture.c b/src/enc/picture.c index 3ed6cc0a..a3323d2b 100644 --- a/src/enc/picture.c +++ b/src/enc/picture.c @@ -28,7 +28,8 @@ int WebPPictureAlloc(WebPPicture* const picture) { const int width = picture->width; const int height = picture->height; const int y_stride = width; - const int uv_width = (width + 1) / 2, uv_height = (height + 1) / 2; + const int uv_width = (width + 1) / 2; + const int uv_height = (height + 1) / 2; const int uv_stride = uv_width; int uv0_stride = 0; int a_width, a_stride;