From: Brian Paul <brianp@vmware.com>
Date: Wed, 17 Mar 2010 16:11:09 +0000 (-0600)
Subject: progs/samples: silence warnings
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bf1974b37d6b92448b068dda8f8f4e9aab4dc537;p=mesa.git

progs/samples: silence warnings
---

diff --git a/progs/samples/loadppm.c b/progs/samples/loadppm.c
index be056d62940..adae9b491e4 100644
--- a/progs/samples/loadppm.c
+++ b/progs/samples/loadppm.c
@@ -9,7 +9,7 @@ static PPMImage *LoadPPM(const char *filename)
     char buff[16];
     PPMImage *result;
     FILE *fp;
-    int maxval;
+    int maxval, w, h;
 
     fp = fopen(filename, "rb");
     if (!fp)
@@ -37,11 +37,13 @@ static PPMImage *LoadPPM(const char *filename)
 	exit(1);
     }
 
-    if (fscanf(fp, "%lu %lu", &result->sizeX, &result->sizeY) != 2)
+    if (fscanf(fp, "%d %d", &w, &h) != 2)
     {
 	fprintf(stderr, "Error loading image `%s'\n", filename);
 	exit(1);
     }
+    result->sizeX = w;
+    result->sizeY = h;
 
     if (fscanf(fp, "%d", &maxval) != 1)
     {