From 92504d214c85454824bd14bc4f5c7c57a361d880 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Tue, 24 Jan 2017 15:07:03 -0800
Subject: [PATCH] get_disto: make ReadPicture() return a bool

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

Change-Id: I935a8c44c98fc085f0f6f360b3851826e1480f09
---
 extras/get_disto.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/extras/get_disto.c b/extras/get_disto.c
index 7999ce50..aa29910c 100644
--- a/extras/get_disto.c
+++ b/extras/get_disto.c
@@ -27,8 +27,8 @@
 #include "../imageio/image_dec.h"
 #include "../imageio/imageio_util.h"
 
-static size_t ReadPicture(const char* const filename, WebPPicture* const pic,
-                          int keep_alpha) {
+static int ReadPicture(const char* const filename, WebPPicture* const pic,
+                       int keep_alpha) {
   const uint8_t* data = NULL;
   size_t data_size = 0;
   WebPImageReader reader = NULL;
@@ -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);
   }
   free((void*)data);
-  return ok ? data_size : 0;
+  return ok;
 }
 
 static void RescalePlane(uint8_t* plane, int width, int height,
@@ -222,7 +222,6 @@ int main(int argc, const char *argv[]) {
   WebPPicture pic1, pic2;
   int ret = 1;
   float disto[5];
-  size_t size1 = 0, size2 = 0;
   int type = 0;
   int c;
   int help = 0;
@@ -271,10 +270,10 @@ int main(int argc, const char *argv[]) {
     Help();
     goto End;
   }
-  if ((size1 = ReadPicture(name1, &pic1, 1)) == 0) {
+  if (!ReadPicture(name1, &pic1, 1)) {
     goto End;
   }
-  if ((size2 = ReadPicture(name2, &pic2, 1)) == 0) {
+  if (!ReadPicture(name2, &pic2, 1)) {
     goto End;
   }
   if (!keep_alpha) {
@@ -286,9 +285,8 @@ int main(int argc, const char *argv[]) {
     fprintf(stderr, "Error while computing the distortion.\n");
     goto End;
   }
-  printf("%u %.2f    %.2f %.2f %.2f %.2f\n",
-         (unsigned int)size1, disto[4],
-         disto[0], disto[1], disto[2], disto[3]);
+  printf("%.2f    %.2f %.2f %.2f %.2f\n",
+         disto[4], disto[0], disto[1], disto[2], disto[3]);
 
   if (output != NULL) {
     uint8_t* data = NULL;