libgd
/
libgd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch libpng warnings (#295)

master
woho 2021-10-21 11:53:17 +02:00 committed by Mike Frysinger
parent ba14dec6ef
commit 636100b928
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gd_png.c
View File

@ -77,6 +77,11 @@ gdPngErrorHandler (png_structp png_ptr, png_const_charp msg)
longjmp (jmpbuf_ptr->jmpbuf, 1);
}
static void gdPngWarningHandler (png_structp png_ptr, png_const_charp msg)
{
gd_error_ex(GD_WARNING, "gd-png: libpng warning: %s", msg);
}
#endif
static void
@ -235,7 +240,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromPngCtx (gdIOCtx * infile)
}
#ifdef PNG_SETJMP_SUPPORTED
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, &jbw, gdPngErrorHandler, NULL);
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, &jbw, gdPngErrorHandler, gdPngWarningHandler);
#else
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
#endif
@ -787,7 +792,7 @@ static int _gdImagePngCtxEx(gdImagePtr im, gdIOCtx * outfile, int level)
#ifdef PNG_SETJMP_SUPPORTED
png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING,
&jbw, gdPngErrorHandler,
NULL);
gdPngWarningHandler);
#else
png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
#endif