dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-07-12 22:14:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "rename 'use_argb_input' to 'use_argb'" into 0.2.0

Browse Source
This commit is contained in:
James Zern
2012-07-18 23:26:42 -07:00
committed by Gerrit Code Review
parent ce90847a40 dd1081763c
commit 3e5bbe1c2e
4 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/cwebp.c
View File

@ -64,13 +64,13 @@ extern void* VP8GetCPUInfo; // opaque forward declaration.
static int verbose = 0;
static int ReadYUV(FILE* in_file, WebPPicture* const pic) {
const int use_argb_input = pic->use_argb_input;
const int use_argb = pic->use_argb;
const int uv_width = (pic->width + 1) / 2;
const int uv_height = (pic->height + 1) / 2;
int y;
int ok = 0;
pic->use_argb_input = 0;
pic->use_argb = 0;
if (!WebPPictureAlloc(pic)) return ok;
for (y = 0; y < pic->height; ++y) {
@ -87,7 +87,7 @@ static int ReadYUV(FILE* in_file, WebPPicture* const pic) {
goto End;
}
ok = 1;
if (use_argb_input) ok = WebPPictureYUVAToARGB(pic);
if (use_argb) ok = WebPPictureYUVAToARGB(pic);
End:
return ok;
@ -943,7 +943,7 @@ int main(int argc, const char *argv[]) {
keep_alpha = 0;
} else if (!strcmp(argv[c], "-lossless")) {
config.lossless = 1;
picture.use_argb_input = 1;
picture.use_argb = 1;
} else if (!strcmp(argv[c], "-hint") && c < argc - 1) {
++c;
if (!strcmp(argv[c], "photo")) {
@ -1139,7 +1139,7 @@ int main(int argc, const char *argv[]) {
// Write info
if (dump_file) {
if (picture.use_argb_input) {
if (picture.use_argb) {
fprintf(stderr, "Warning: can't dump file (-d option) in lossless mode.");
} else if (!DumpPicture(&picture, dump_file)) {
fprintf(stderr, "Warning, couldn't dump picture %s\n", dump_file);