dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-11-19 20:08:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "cosmetics"

Browse Source
This commit is contained in:
Pascal Massimino 2011-05-05 16:47:19 -07:00 committed by Code Review
commit d0a7038792
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/cwebp.c
View File

@ -603,6 +603,8 @@ static void HelpLong(void) {
printf("\n");
printf(" -m <int> ............... compression method (0=fast, 6=slowest)\n");
printf(" -segments <int> ........ number of segments to use (1..4)\n");
printf(" -size <int> ............ Target size (in bytes)\n");
printf(" -psnr <float> .......... Target PSNR (in dB. typically: 42)\n");
printf("\n");
printf(" -s <int> <int> ......... Input size (width x height) for YUV\n");
printf(" -sns <int> ............. 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 <int> ............ Target size (in bytes)\n");
printf(" -psnr <float> .......... Target PSNR (in dB. typically: 42)\n");
printf(" -af .................... auto-adjust filter strength.\n");
printf(" -pre <int> ............. 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);

3
src/enc/picture.c
View File

@ -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;