callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make libpng use g_malloc instead of system malloc.

Browse Source 
* io-png.c (gdk_pixbuf__png_image_load,
	gdk_pixbuf__png_image_begin_load): Make libpng use g_malloc
	instead of system malloc.
This commit is contained in:
Matthias Clasen
2002-03-26 23:17:31 +00:00
parent d8f5dcdd13
commit 266c62df8f
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,9 @@
2002-03-27 Matthias Clasen <maclas@gmx.de>
* io-png.c (gdk_pixbuf__png_image_load,
gdk_pixbuf__png_image_begin_load): Make libpng use g_malloc
instead of system malloc.
2002-03-26 Matthias Clasen <maclas@gmx.de> 2002-03-26 Matthias Clasen <maclas@gmx.de>
* io-tiff.c (tiff_image_parse): Don't leak pixbuf on error. * io-tiff.c (tiff_image_parse): Don't leak pixbuf on error.

34
gdk-pixbuf/io-png.c
View File

@ -222,6 +222,18 @@ png_text_to_pixbuf_option (png_text text_ptr,
} }
} }
static png_voidp
png_malloc_callback (png_structp o, png_size_t size)
{
return g_try_malloc (size);
}
static void
png_free_callback (png_structp o, png_voidp x)
{
g_free (x);
}
/* Shared library entry point */ /* Shared library entry point */
static GdkPixbuf * static GdkPixbuf *
gdk_pixbuf__png_image_load (FILE *f, GError **error) gdk_pixbuf__png_image_load (FILE *f, GError **error)
@ -237,10 +249,20 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
gint num_texts; gint num_texts;
gchar **options = NULL; gchar **options = NULL;
#ifdef PNG_USER_MEM_SUPPORTED
png_ptr = png_create_read_struct_2 (PNG_LIBPNG_VER_STRING,
error,
png_simple_error_callback,
png_simple_warning_callback,
NULL,
png_malloc_callback,
png_free_callback);
#else
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING,
error, error,
png_simple_error_callback, png_simple_error_callback,
png_simple_warning_callback); png_simple_warning_callback);
#endif
if (!png_ptr) if (!png_ptr)
return NULL; return NULL;
@ -421,12 +443,20 @@ gdk_pixbuf__png_image_begin_load (ModulePreparedNotifyFunc prepare_func,
/* Create the main PNG context struct */ /* Create the main PNG context struct */
#ifdef PNG_USER_MEM_SUPPORTED
lc->png_read_ptr = png_create_read_struct_2 (PNG_LIBPNG_VER_STRING,
lc, /* error/warning callback data */
png_error_callback,
png_warning_callback,
NULL,
png_malloc_callback,
png_free_callback);
#else
lc->png_read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, lc->png_read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
lc, /* error/warning callback data */ lc, /* error/warning callback data */
png_error_callback, png_error_callback,
png_warning_callback); png_warning_callback);
#endif
if (lc->png_read_ptr == NULL) { if (lc->png_read_ptr == NULL) {
g_free(lc); g_free(lc);
/* error callback should have set the error */ /* error callback should have set the error */