mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng15] Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around

Browse Source 
declaration of png_handle_unknown().
This commit is contained in:
Glenn Randers-Pehrson 2012-04-23 23:04:32 -05:00
parent c1269a3975
commit 8a3b400826
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ANNOUNCE
View File

@ -32,7 +32,8 @@ Version 1.5.11 [April 24, 2012]
to shared library link; don't try to create a shared lib based on missing to shared library link; don't try to create a shared lib based on missing
RELEASE variable. RELEASE variable.
Enable png_set_check_for_invalid_index() for both read and write. Enable png_set_check_for_invalid_index() for both read and write.
Fixed problem with use of PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpread.c Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around
declaration of png_handle_unknown().
Send comments/corrections/commendations to png-mng-implement at lists.sf.net: Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit (subscription required; visit

3
CHANGES
View File

@ -3860,7 +3860,8 @@ Version 1.5.11 [April 24, 2012]
to shared library link; don't try to create a shared lib based on missing to shared library link; don't try to create a shared lib based on missing
RELEASE variable. RELEASE variable.
Enable png_set_check_for_invalid_index() for both read and write. Enable png_set_check_for_invalid_index() for both read and write.
Fixed problem with use of PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpread.c Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around
declaration of png_handle_unknown().
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

9
pngpread.c
View File

@ -255,11 +255,8 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
png_push_have_end(png_ptr, info_ptr); png_push_have_end(png_ptr, info_ptr);
} }
#ifdef PNG_HANDLE_UNKNOWN_SUPPORTED
else
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
if (png_chunk_unknown_handling(png_ptr, chunk_name)) else if (png_chunk_unknown_handling(png_ptr, chunk_name))
#endif
{ {
if (png_ptr->push_length + 4 > png_ptr->buffer_size) if (png_ptr->push_length + 4 > png_ptr->buffer_size)
{ {
@ -285,8 +282,8 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
png_error(png_ptr, "Missing PLTE before IDAT"); png_error(png_ptr, "Missing PLTE before IDAT");
} }
} }
#endif #endif
else if (chunk_name == png_PLTE) else if (chunk_name == png_PLTE)
{ {
if (png_ptr->push_length + 4 > png_ptr->buffer_size) if (png_ptr->push_length + 4 > png_ptr->buffer_size)
@ -554,7 +551,6 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
#endif #endif
#ifdef PNG_HANDLE_UNKNOWN_SUPPORTED
else else
{ {
if (png_ptr->push_length + 4 > png_ptr->buffer_size) if (png_ptr->push_length + 4 > png_ptr->buffer_size)
@ -564,7 +560,6 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
} }
png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length); png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
} }
#endif
png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
} }

2
pngpriv.h
View File

@ -1259,10 +1259,8 @@ PNG_EXTERN void png_handle_zTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
png_uint_32 length)); png_uint_32 length));
#endif #endif
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr, PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
png_infop info_ptr, png_uint_32 length)); png_infop info_ptr, png_uint_32 length));
#endif
PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr, PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr,
png_uint_32 chunk_name)); png_uint_32 chunk_name));