summaryrefslogtreecommitdiff
path: root/plugingui/png/pngerror.c
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2013-09-15 13:34:50 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2013-09-15 13:34:50 +0200
commitd1d257dea150d79bedcf691d4aaac429b621de46 (patch)
tree31cb5f4f8998f91c8c80b35e1e81b92e7a1c340b /plugingui/png/pngerror.c
parent3693a661f34153dfce88fde07006256ce5b2d636 (diff)
More png experiments...
Diffstat (limited to 'plugingui/png/pngerror.c')
-rw-r--r--plugingui/png/pngerror.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/plugingui/png/pngerror.c b/plugingui/png/pngerror.c
index e0585a8..1c64a7f 100644
--- a/plugingui/png/pngerror.c
+++ b/plugingui/png/pngerror.c
@@ -36,7 +36,7 @@ png_default_warning PNGARG((png_structp png_ptr,
*/
#ifdef PNG_ERROR_TEXT_SUPPORTED
PNG_FUNCTION(void,PNGAPI
-png_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN)
+dg_png_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN)
{
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
char msg[16];
@@ -361,7 +361,7 @@ png_benign_error(png_structp png_ptr, png_const_charp error_message)
if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
png_warning(png_ptr, error_message);
else
- png_error(png_ptr, error_message);
+ dg_png_error(png_ptr, error_message);
}
#endif
@@ -431,12 +431,12 @@ png_chunk_error,(png_structp png_ptr, png_const_charp error_message),
{
char msg[18+PNG_MAX_ERROR_TEXT];
if (png_ptr == NULL)
- png_error(png_ptr, error_message);
+ dg_png_error(png_ptr, error_message);
else
{
png_format_buffer(png_ptr, msg, error_message);
- png_error(png_ptr, msg);
+ dg_png_error(png_ptr, msg);
}
}
#endif /* PNG_READ_SUPPORTED && PNG_ERROR_TEXT_SUPPORTED */
@@ -488,7 +488,7 @@ png_fixed_error,(png_structp png_ptr, png_const_charp name),PNG_NORETURN)
++iin;
}
msg[fixed_message_ln + iin] = 0;
- png_error(png_ptr, msg);
+ dg_png_error(png_ptr, msg);
}
#endif
#endif
@@ -498,7 +498,7 @@ png_fixed_error,(png_structp png_ptr, png_const_charp name),PNG_NORETURN)
* otherwise it is necessary for png_default_error to be overridden.
*/
jmp_buf* PNGAPI
-png_set_longjmp_fn(png_structp png_ptr, png_longjmp_ptr longjmp_fn,
+dg_png_set_longjmp_fn(png_structp png_ptr, png_longjmp_ptr longjmp_fn,
size_t jmp_buf_size)
{
if (png_ptr == NULL || jmp_buf_size != png_sizeof(jmp_buf))