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

get_disto: make ReadPicture() return a bool

Browse Source 
the input size of one of the images in the output didn't add much value.

Change-Id: I935a8c44c98fc085f0f6f360b3851826e1480f09
This commit is contained in:
James Zern 2017-01-24 15:07:03 -08:00
parent c3e4b3a946
commit 92504d214c
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extras/get_disto.c
View File

@ -27,7 +27,7 @@
#include "../imageio/image_dec.h" #include "../imageio/image_dec.h"
#include "../imageio/imageio_util.h" #include "../imageio/imageio_util.h"
static size_t ReadPicture(const char* const filename, WebPPicture* const pic, static int ReadPicture(const char* const filename, WebPPicture* const pic,
int keep_alpha) { int keep_alpha) {
const uint8_t* data = NULL; const uint8_t* data = NULL;
size_t data_size = 0; size_t data_size = 0;
@ -45,7 +45,7 @@ static size_t ReadPicture(const char* const filename, WebPPicture* const pic,
fprintf(stderr, "Error! Could not process file %s\n", filename); fprintf(stderr, "Error! Could not process file %s\n", filename);
} }
free((void*)data); free((void*)data);
return ok ? data_size : 0; return ok;
} }
static void RescalePlane(uint8_t* plane, int width, int height, static void RescalePlane(uint8_t* plane, int width, int height,
@ -222,7 +222,6 @@ int main(int argc, const char *argv[]) {
WebPPicture pic1, pic2; WebPPicture pic1, pic2;
int ret = 1; int ret = 1;
float disto[5]; float disto[5];
size_t size1 = 0, size2 = 0;
int type = 0; int type = 0;
int c; int c;
int help = 0; int help = 0;
@ -271,10 +270,10 @@ int main(int argc, const char *argv[]) {
Help(); Help();
goto End; goto End;
} }
if ((size1 = ReadPicture(name1, &pic1, 1)) == 0) { if (!ReadPicture(name1, &pic1, 1)) {
goto End; goto End;
} }
if ((size2 = ReadPicture(name2, &pic2, 1)) == 0) { if (!ReadPicture(name2, &pic2, 1)) {
goto End; goto End;
} }
if (!keep_alpha) { if (!keep_alpha) {
@ -286,9 +285,8 @@ int main(int argc, const char *argv[]) {
fprintf(stderr, "Error while computing the distortion.\n"); fprintf(stderr, "Error while computing the distortion.\n");
goto End; goto End;
} }
printf("%u %.2f %.2f %.2f %.2f %.2f\n", printf("%.2f %.2f %.2f %.2f %.2f\n",
(unsigned int)size1, disto[4], disto[4], disto[0], disto[1], disto[2], disto[3]);
disto[0], disto[1], disto[2], disto[3]);
if (output != NULL) { if (output != NULL) {
uint8_t* data = NULL; uint8_t* data = NULL;