summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-03-17 10:11:09 -0600
committerBrian Paul <brianp@vmware.com>2010-03-17 10:11:09 -0600
commitbf1974b37d6b92448b068dda8f8f4e9aab4dc537 (patch)
treecd1a5906086a0b4e7ab0fa430e6444f28217d450 /progs
parent59e743b8d393f2bdf023e3a5ad8fe848a7459ec9 (diff)
progs/samples: silence warnings
Diffstat (limited to 'progs')
-rw-r--r--progs/samples/loadppm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/progs/samples/loadppm.c b/progs/samples/loadppm.c
index be056d6294..adae9b491e 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)
{