mirror of
https://git.code.sf.net/p/libpng/code.git
synced 2025-07-10 18:04:09 +02:00
[libpng16] Changed png_memcpy to C assignment where appropriate. Changed all
those uses of png_memcpy that were doing a simple assignment to assignments (all those cases where the thing being copied is a non-array C L-value.) Added some error checking to png_set_*() routines and removed the reference to the non-exported function png_memcpy() from example.c. Fixed the Visual C 64-bit build - it requires jmp_buf to be aligned, but it had become misaligned.
This commit is contained in:
committed by
Glenn Randers-Pehrson
parent
4f67e40898
commit
fcd301daed
6
png.c
6
png.c
@@ -762,13 +762,13 @@ png_get_copyright(png_const_structrp png_ptr)
|
||||
#else
|
||||
# ifdef __STDC__
|
||||
return PNG_STRING_NEWLINE \
|
||||
"libpng version 1.6.0beta04 - December 28, 2011" PNG_STRING_NEWLINE \
|
||||
"libpng version 1.6.0beta04 - December 29, 2011" PNG_STRING_NEWLINE \
|
||||
"Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
|
||||
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
|
||||
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
|
||||
PNG_STRING_NEWLINE;
|
||||
# else
|
||||
return "libpng version 1.6.0beta04 - December 28, 2011\
|
||||
return "libpng version 1.6.0beta04 - December 29, 2011\
|
||||
Copyright (c) 1998-2011 Glenn Randers-Pehrson\
|
||||
Copyright (c) 1996-1997 Andreas Dilger\
|
||||
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
|
||||
@@ -822,7 +822,7 @@ png_handle_as_unknown(png_structrp png_ptr, png_const_bytep chunk_name)
|
||||
/* Check chunk_name and return "keep" value if it's on the list, else 0 */
|
||||
png_const_bytep p, p_end;
|
||||
|
||||
if (png_ptr == NULL || chunk_name == NULL || png_ptr->num_chunk_list <= 0)
|
||||
if (png_ptr == NULL || chunk_name == NULL || png_ptr->num_chunk_list == 0)
|
||||
return PNG_HANDLE_CHUNK_AS_DEFAULT;
|
||||
|
||||
p_end = png_ptr->chunk_list;
|
||||
|
||||
Reference in New Issue
Block a user