[libpng16] Push two files that weren't updated in previous push.
This commit is contained in:
parent
2414bd99d8
commit
4567935fe4
8
png.c
8
png.c
@ -545,7 +545,7 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
|
|||||||
{
|
{
|
||||||
if (info_ptr->splt_palettes_num)
|
if (info_ptr->splt_palettes_num)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
int i;
|
||||||
for (i = 0; i < info_ptr->splt_palettes_num; i++)
|
for (i = 0; i < info_ptr->splt_palettes_num; i++)
|
||||||
png_free_data(png_ptr, info_ptr, PNG_FREE_SPLT, (int)i);
|
png_free_data(png_ptr, info_ptr, PNG_FREE_SPLT, (int)i);
|
||||||
|
|
||||||
@ -572,7 +572,7 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
|
|||||||
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
unsigned int i;
|
int i;
|
||||||
|
|
||||||
if (info_ptr->unknown_chunks_num)
|
if (info_ptr->unknown_chunks_num)
|
||||||
{
|
{
|
||||||
@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr)
|
|||||||
#else
|
#else
|
||||||
# ifdef __STDC__
|
# ifdef __STDC__
|
||||||
return PNG_STRING_NEWLINE \
|
return PNG_STRING_NEWLINE \
|
||||||
"libpng version 1.6.0beta40 - January 19, 2013" PNG_STRING_NEWLINE \
|
"libpng version 1.6.0beta40 - January 20, 2013" PNG_STRING_NEWLINE \
|
||||||
"Copyright (c) 1998-2013 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
|
"Copyright (c) 1998-2013 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
|
||||||
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
|
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
|
||||||
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
|
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
|
||||||
PNG_STRING_NEWLINE;
|
PNG_STRING_NEWLINE;
|
||||||
# else
|
# else
|
||||||
return "libpng version 1.6.0beta40 - January 19, 2013\
|
return "libpng version 1.6.0beta40 - January 20, 2013\
|
||||||
Copyright (c) 1998-2013 Glenn Randers-Pehrson\
|
Copyright (c) 1998-2013 Glenn Randers-Pehrson\
|
||||||
Copyright (c) 1996-1997 Andreas Dilger\
|
Copyright (c) 1996-1997 Andreas Dilger\
|
||||||
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
|
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
|
||||||
|
@ -223,8 +223,9 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
|
|||||||
#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
|
#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
|
||||||
/* Storage for unknown chunks that the library doesn't recognize. */
|
/* Storage for unknown chunks that the library doesn't recognize. */
|
||||||
png_unknown_chunkp unknown_chunks;
|
png_unknown_chunkp unknown_chunks;
|
||||||
/* The type of this field must match png_struct::user_chunk_cache_max,
|
|
||||||
* else overflow can occur.
|
/* The type of this field is limited by the type of
|
||||||
|
* png_struct::user_chunk_cache_max, else overflow can occur.
|
||||||
*/
|
*/
|
||||||
int unknown_chunks_num;
|
int unknown_chunks_num;
|
||||||
#endif
|
#endif
|
||||||
@ -232,7 +233,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
|
|||||||
#ifdef PNG_sPLT_SUPPORTED
|
#ifdef PNG_sPLT_SUPPORTED
|
||||||
/* Data on sPLT chunks (there may be more than one). */
|
/* Data on sPLT chunks (there may be more than one). */
|
||||||
png_sPLT_tp splt_palettes;
|
png_sPLT_tp splt_palettes;
|
||||||
int splt_palettes_num;
|
int splt_palettes_num; /* Match type returned by png_get API */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef PNG_sCAL_SUPPORTED
|
#ifdef PNG_sCAL_SUPPORTED
|
||||||
|
Loading…
Reference in New Issue
Block a user