summaryrefslogtreecommitdiff
path: root/pngerror.c
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@acm.org>2012-01-16 07:48:36 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2012-01-16 07:48:36 -0600
commit04336ba10ff4da8b69292f6c936c4c0d7bbe67c7 (patch)
treec7bbf0a38f2b2f04f4e2f07637d7f3710a059523 /pngerror.c
parentda1c5ca65a061676dc152014fefbed5f7576d7f5 (diff)
downloadlibpng-04336ba10ff4da8b69292f6c936c4c0d7bbe67c7.tar.gz
[libpng16] Add palette support to the simplified APIs. This commit
changes some of the macro definitions in png.h, app code may need corresponding changes.
Diffstat (limited to 'pngerror.c')
-rw-r--r--pngerror.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pngerror.c b/pngerror.c
index ed75c2f2c..f9861f6e4 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -789,7 +789,7 @@ png_safe_error,(png_structp png_nonconst_ptr, png_const_charp error_message),
if (image != NULL)
{
png_safecat(image->message, sizeof image->message, 0, error_message);
- image->warning_or_error = 1;
+ image->warning_or_error |= PNG_IMAGE_ERROR;
/* Retrieve the jmp_buf from within the png_control, making this work for
* C++ compilation too is pretty tricky: C++ wants a pointer to the first
@@ -821,7 +821,7 @@ png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message)
if (image->warning_or_error == 0)
{
png_safecat(image->message, sizeof image->message, 0, warning_message);
- image->warning_or_error = 2;
+ image->warning_or_error |= PNG_IMAGE_WARNING;
}
}
#endif