diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2009-12-07 17:16:10 -0800 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-12-07 17:16:10 -0800 |
commit | 8fc433fa0f8c5364454858f9be919387feda440c (patch) | |
tree | ec4fd82af464123acbef1f16212aa44e8f9fddd1 /progs/samples/rgbtoppm.c | |
parent | bb64c9bcdf9962c4f74d71f49307de1da4c3392b (diff) | |
parent | 9dbd47fc6b1cf9ddfb318f2e05df0886cd5fe0df (diff) |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
progs/demos/projtex.c
progs/xdemos/glxinfo.c
src/mesa/main/version.h
To fix the confilicts in projtex.c and glxinfo.c I just took the code from
mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from
mesa_7_7_branch to mesa_7_6_branch followed by commmits just to
mesa_7_6_branch.
Diffstat (limited to 'progs/samples/rgbtoppm.c')
-rw-r--r-- | progs/samples/rgbtoppm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/progs/samples/rgbtoppm.c b/progs/samples/rgbtoppm.c index 116d9a8cfa..56ca5b0efe 100644 --- a/progs/samples/rgbtoppm.c +++ b/progs/samples/rgbtoppm.c @@ -86,7 +86,8 @@ static ImageRec *ImageOpen(char *fileName) exit(1); } if ((image->file = fopen(fileName, "rb")) == NULL) { - return NULL; + free(image); + return NULL; } fread(image, 1, 12, image->file); @@ -224,6 +225,7 @@ read_rgb_texture(char *name, int *width, int *height) if (gbuf) free(gbuf); if (bbuf) free(bbuf); if (abuf) free(abuf); + ImageClose(image); return NULL; } ptr = base; |