Fix: Free Resources
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6985 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 55d80a0a5dcc4ef926f4cbfa7b4db50db43b732b Former-commit-id: ca08dbc189bcfda496d1bfc2880c1776ec0845c4
This commit is contained in:
parent
147cefdb61
commit
66a0e86140
1 changed files with 4 additions and 1 deletions
|
@ -297,6 +297,7 @@ GfTexReadImageFromPNG(const char *filename, float screen_gamma, int *pWidth, int
|
||||||
filename, (unsigned long)(tgt_height * tgt_rowbytes));
|
filename, (unsigned long)(tgt_height * tgt_rowbytes));
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
|
png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
|
||||||
|
free(row_pointers);
|
||||||
return (unsigned char *)NULL;
|
return (unsigned char *)NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -348,7 +349,7 @@ struct gfTexJPEGErrorManager {
|
||||||
* Here's the routine that will replace the standard error_exit method:
|
* Here's the routine that will replace the standard error_exit method:
|
||||||
*/
|
*/
|
||||||
|
|
||||||
METHODDEF(void)
|
static void
|
||||||
gfTexJPEGErrorExit (j_common_ptr cinfo)
|
gfTexJPEGErrorExit (j_common_ptr cinfo)
|
||||||
{
|
{
|
||||||
/* cinfo->err really points to a jpeg_error_mgr, so coerce pointer */
|
/* cinfo->err really points to a jpeg_error_mgr, so coerce pointer */
|
||||||
|
@ -563,12 +564,14 @@ GfTexWriteImageToPNG(unsigned char *img, const char *filename, int width, int he
|
||||||
|
|
||||||
png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, (png_error_ptr)NULL, (png_error_ptr)NULL);
|
png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, (png_error_ptr)NULL, (png_error_ptr)NULL);
|
||||||
if (png_ptr == NULL) {
|
if (png_ptr == NULL) {
|
||||||
|
fclose(fp);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
info_ptr = png_create_info_struct(png_ptr);
|
info_ptr = png_create_info_struct(png_ptr);
|
||||||
if (info_ptr == NULL) {
|
if (info_ptr == NULL) {
|
||||||
png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
|
png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
|
||||||
|
fclose(fp);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue