[libpng16] Imported from libpng-1.6.10rc01.tar

This commit is contained in:
Glenn Randers-Pehrson
2014-02-27 08:00:17 -06:00
parent 3455238a4e
commit ab56b743c1
25 changed files with 61 additions and 58 deletions

8
png.c
View File

@@ -14,7 +14,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef png_libpng_version_1_6_10beta04 Your_png_h_is_not_version_1_6_10beta04;
typedef png_libpng_version_1_6_10rc01 Your_png_h_is_not_version_1_6_10rc01;
/* Tells libpng that we have already handled the first "num_bytes" bytes
* of the PNG file signature. If the PNG data is embedded into another
@@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
"libpng version 1.6.10beta04 - February 25, 2014" PNG_STRING_NEWLINE \
"libpng version 1.6.10rc01 - February 27, 2014" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2014 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.10beta04 - February 25, 2014\
return "libpng version 1.6.10rc01 - February 27, 2014\
Copyright (c) 1998-2014 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -2295,6 +2295,7 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,
}
}
# if PNG_sRGB_PROFILE_CHECKS > 0
/* The signature matched, but the profile had been changed in some
* way. This probably indicates a data error or uninformed hacking.
* Fall through to "no match".
@@ -2303,6 +2304,7 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,
"Not recognizing known sRGB profile that has been edited",
PNG_CHUNK_WARNING);
break;
# endif
}
}