[libpng16] Added PNG_SKIP_sRGB_CHECK_PROFILE choice for png_set_option().

This commit is contained in:
Glenn Randers-Pehrson
2014-05-07 12:07:12 -05:00
parent 0d5ac5d809
commit e95ce2c517
6 changed files with 57 additions and 31 deletions

13
png.h
View File

@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.6.11beta06 - April 26, 2014
* libpng version 1.6.11beta06 - May 7, 2014
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -11,7 +11,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.6.11beta06 - April 26, 2014: Glenn
* libpng versions 0.97, January 1998, through 1.6.11beta06 - May 7, 2014: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -227,7 +227,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.6.11beta06, April 26, 2014, are
* libpng versions 1.2.6, August 15, 2004, through 1.6.11beta06, May 7, 2014, are
* Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors:
@@ -339,7 +339,7 @@
* Y2K compliance in libpng:
* =========================
*
* April 26, 2014
* May 7, 2014
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -409,7 +409,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.11beta06"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.6.11beta06 - April 26, 2014\n"
" libpng version 1.6.11beta06 - May 7, 2014\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
@@ -3226,7 +3226,8 @@ PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
# define PNG_ARM_NEON 0 /* HARDWARE: ARM Neon SIMD instructions supported */
#endif
#define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */
#define PNG_OPTION_NEXT 4 /* Next option - numbers must be even */
#define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */
#define PNG_OPTION_NEXT 6 /* Next option - numbers must be even */
/* Return values: NOTE: there are four values and 'off' is *not* zero */
#define PNG_OPTION_UNSET 0 /* Unset - defaults to off */