jdk-sandbox: comparison jdk/src/java.desktop/share/native/libsplashscreen/libpng/png.h

equal deleted inserted replaced

-:6351c8545289
+:2b8d397c03a4
 * This file is available under and governed by the GNU General Public
 * License version 2 only, as published by the Free Software Foundation.
 * However, the following notice accompanied the original version of this
 * file and, per its terms, should not be removed:
 *
-* libpng version 1.6.23, June 9, 2016
+* libpng version 1.6.28, January 5, 2017
 *
-* Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
+* Copyright (c) 1998-2002,2004,2006-2017 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.)
 *
 * This code is released under the libpng license (See LICENSE, below)
 *
 * Authors and maintainers:
 *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
 *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
-*   libpng versions 0.97, January 1998, through 1.6.23, June 9, 2016:
+*   libpng versions 0.97, January 1998, through 1.6.28, January 5, 2017:
 *     Glenn Randers-Pehrson.
 *   See also "Contributing Authors", below.
 */
 /*
 * If you modify libpng you may insert additional notices immediately following
 * this sentence.
 *
 * This code is released under the libpng license.
 *
-* Some files in the "contrib" directory and some configure-generated
+* libpng versions 1.0.7, July 1, 2000 through 1.6.28, January 5, 2017 are
-* files that are distributed with libpng have other copyright owners and
+* Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
-* are released under other open source licenses.
-*
-* libpng versions 1.0.7, July 1, 2000 through 1.6.23, June 9, 2016 are
-* Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
 * derived from libpng-1.0.6, and are distributed according to the same
 * disclaimer and license as libpng-1.0.6 with the following individuals
 * added to the list of Contributing Authors:
 *
 *    Simon-Pierre Cadieux
 *    Eric S. Raymond
 *    Mans Rullgard
 *    Cosmin Truta
 *    Gilles Vollant
 *    James Yu
+*    Mandar Sahastrabuddhe
 *
 * and with the following additions to the disclaimer:
 *
 *    There is no warranty against interference with your enjoyment of the
 *    library or against infringement.  There is no warranty that our
 *    efforts or the library will fulfill any of your particular purposes
 *    or needs.  This library is provided with all faults, and the entire
 *    risk of satisfactory quality, performance, accuracy, and effort is with
 *    the user.
 *
-* Some files in the "contrib" directory have other copyright owners and
+* Some files in the "contrib" directory and some configure-generated
+* files that are distributed with libpng have other copyright owners and
 * are released under other open source licenses.
-*
 *
 * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
 * Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
 * libpng-0.96, and are distributed according to the same disclaimer and
 * license as libpng-0.96, with the following individuals added to the list
 * of Contributing Authors:
 *
 *    Tom Lane
 *    Glenn Randers-Pehrson
 *    Willem van Schaik
-*
-* Some files in the "scripts" directory have different copyright owners
-* but are also released under this license.
 *
 * libpng versions 0.89, June 1996, through 0.96, May 1997, are
 * Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
 * and are distributed according to the same disclaimer and license as
 * libpng-0.88, with the following individuals added to the list of
 *    1.0.7rc1-2               1    10007  2.1.0.7rc1-2 (binary compatible)
 *    1.0.7                    1    10007  (still compatible)
 *    ...
 *    1.0.19                  10    10019  10.so.0.19[.0]
 *    ...
-*    1.2.56                  13    10256  12.so.0.56[.0]
+*    1.2.57                  13    10257  12.so.0.57[.0]
 *    ...
-*    1.5.27                  15    10527  15.so.15.27[.0]
+*    1.5.28                  15    10527  15.so.15.28[.0]
 *    ...
-*    1.6.23                  16    10623  16.so.16.23[.0]
+*    1.6.28                  16    10628  16.so.16.28[.0]
 *
 *    Henceforth the source version will match the shared-library major
 *    and minor numbers; the shared-library major version number will be
 *    used for changes in backward compatibility, as it is intended.  The
 *    PNG_LIBPNG_VER macro, which is not used within libpng but is available
 /*
 * Y2K compliance in libpng:
 * =========================
 *
-*    June 9, 2016
+*    January 5, 2017
 *
 *    Since the PNG Development group is an ad-hoc body, we can't make
 *    an official declaration.
 *
 *    This is your unofficial assurance that libpng from version 0.71 and
-*    upward through 1.6.23 are Y2K compliant.  It is my belief that
+*    upward through 1.6.28 are Y2K compliant.  It is my belief that
 *    earlier versions were also Y2K compliant.
 *
 *    Libpng only has two year fields.  One is a 2-byte unsigned integer
 *    that will hold years up to 65535.  The other, which is deprecated,
 *    holds the date in text format, and will hold years up to 9999.
 * If you just need to read a PNG file and don't want to read the documentation
 * skip to the end of this file and read the section entitled 'simplified API'.
 */
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.23"
+#define PNG_LIBPNG_VER_STRING "1.6.28"
-#define PNG_HEADER_VERSION_STRING \
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.28 - January 5, 2017\n"
-" libpng version 1.6.23 - June 9, 2016\n"
 #define PNG_LIBPNG_VER_SONUM   16
 #define PNG_LIBPNG_VER_DLLNUM  16
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   6
-#define PNG_LIBPNG_VER_RELEASE 23
+#define PNG_LIBPNG_VER_RELEASE 28
 /* This should match the numeric part of the final component of
 * PNG_LIBPNG_VER_STRING, omitting any leading zero:
 */
 * We must not include leading zeros.
 * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
 * version 1.0.0 was mis-numbered 100 instead of 10000).  From
 * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release
 */
-#define PNG_LIBPNG_VER 10623 /* 1.6.23 */
+#define PNG_LIBPNG_VER 10628 /* 1.6.28 */
 /* Library configuration: these options cannot be changed after
 * the library has been built.
 */
 #ifndef PNGLCONF_H
 /* If pnglibconf.h is missing, you can
 * copy scripts/pnglibconf.h.prebuilt to pnglibconf.h
 */
 #   include "pnglibconf.h"
 #endif
 #ifndef PNG_VERSION_INFO_ONLY
 /* Machine specific configuration. */
 #  include "pngconf.h"
 #endif
 /*
 * Added at libpng-1.2.8
 */
 /* This triggers a compiler error in png.c, if png.c and png.h
 * do not agree upon the version number.
 */
-typedef char* png_libpng_version_1_6_23;
+typedef char* png_libpng_version_1_6_28;
 /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
 *
 * png_struct is the cache of information used while reading or writing a single
 * PNG file.  One of these is always required, although the simplified API
 *
 * The data in the structure is set by libpng on read and used on write.
 */
 typedef struct png_unknown_chunk_t
 {
 png_byte name[5]; /* Textual chunk name with '\0' terminator */
 png_byte *data;   /* Data, should not be modified on read! */
 png_size_t size;
 /* On write 'location' must be set using the flag values listed below.
 * Notice that on read it is set by libpng however the values stored have
 * more bits set than are listed below.  Always treat the value as a
 * bitmask.  On write set only one bit - setting multiple bits may cause the
 * chunk to be written in multiple places.
 */
 png_byte location; /* mode of operation at read time */
 }
 png_unknown_chunk;
 typedef png_unknown_chunk * png_unknown_chunkp;
 typedef const png_unknown_chunk * png_const_unknown_chunkp;
 *    If num_chunks is negative, then the "keep" parameter specifies the manner
 *    for handling all unknown chunks plus all chunks recognized by libpng
 *    except for the IHDR, PLTE, tRNS, IDAT, and IEND chunks (which continue to
 *    be processed by libpng.
 */
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 PNG_EXPORT(172, void, png_set_keep_unknown_chunks, (png_structrp png_ptr,
 int keep, png_const_bytep chunk_list, int num_chunks));
+#endif /* HANDLE_AS_UNKNOWN */
 /* The "keep" PNG_HANDLE_CHUNK_ parameter for the specified chunk is returned;
 * the result is therefore true (non-zero) if special handling is required,
 * false for the default handling.
 */
 PNG_EXPORT(173, int, png_handle_as_unknown, (png_const_structrp png_ptr,
 png_const_bytep chunk_name));
-#endif
+#endif /* SET_UNKNOWN_CHUNKS */
 #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
 PNG_EXPORT(174, void, png_set_unknown_chunks, (png_const_structrp png_ptr,
 png_inforp info_ptr, png_const_unknown_chunkp unknowns,
 int num_unknowns));
 * [Optimized code by Greg Roelofs and Mark Adler...blame us for bugs. :-) ]
 */
 /* fg and bg should be in `gamma 1.0' space; alpha is the opacity */
-#  define png_composite(composite, fg, alpha, bg)         \
+#  define png_composite(composite, fg, alpha, bg)        \
-{ png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) \
+{                                                     \
-* (png_uint_16)(alpha)                         \
+png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) \
-+ (png_uint_16)(bg)*(png_uint_16)(255          \
+* (png_uint_16)(alpha)                         \
-- (png_uint_16)(alpha)) + 128);                \
++ (png_uint_16)(bg)*(png_uint_16)(255          \
-(composite) = (png_byte)(((temp + (temp >> 8)) >> 8) & 0xff); }
+- (png_uint_16)(alpha)) + 128);                \
+(composite) = (png_byte)(((temp + (temp >> 8)) >> 8) & 0xff); \
-#  define png_composite_16(composite, fg, alpha, bg)       \
+}
-{ png_uint_32 temp = (png_uint_32)((png_uint_32)(fg)  \
-* (png_uint_32)(alpha)                          \
+#  define png_composite_16(composite, fg, alpha, bg)     \
-+ (png_uint_32)(bg)*(65535                      \
+{                                                     \
-- (png_uint_32)(alpha)) + 32768);               \
+png_uint_32 temp = (png_uint_32)((png_uint_32)(fg) \
-(composite) = (png_uint_16)(0xffff & ((temp + (temp >> 16)) >> 16)); }
+* (png_uint_32)(alpha)                         \
++ (png_uint_32)(bg)*(65535                     \
+- (png_uint_32)(alpha)) + 32768);              \
+(composite) = (png_uint_16)(0xffff & ((temp + (temp >> 16)) >> 16)); \
+}
 #else  /* Standard method using integer division */
-#  define png_composite(composite, fg, alpha, bg)                        \
+#  define png_composite(composite, fg, alpha, bg)                      \
 (composite) =                                                       \
 (png_byte)(0xff & (((png_uint_16)(fg) * (png_uint_16)(alpha) +  \
 (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) + \
 127) / 255))
-#  define png_composite_16(composite, fg, alpha, bg)                         \
+#  define png_composite_16(composite, fg, alpha, bg)                       \
 (composite) =                                                           \
 (png_uint_16)(0xffff & (((png_uint_32)(fg) * (png_uint_32)(alpha) + \
 (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) +     \
 32767) / 65535))
 #endif /* READ_COMPOSITE_NODIV */
 #ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
 PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));
 PNG_EXPORT(202, png_uint_16, png_get_uint_16, (png_const_bytep buf));
 /* Inline macros to do direct reads of bytes from the input buffer.
 * The png_get_int_32() routine assumes we are using two's complement
 * format for negative values, which is almost certainly true.
 */
 #  define PNG_get_uint_32(buf) \
 (((png_uint_32)(*(buf)) << 24) + \
 ((png_uint_32)(*((buf) + 1)) << 16) + \
 ((png_uint_32)(*((buf) + 2)) << 8) + \
 ((png_uint_32)(*((buf) + 3))))
 /* From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the
 * function) incorrectly returned a value of type png_uint_32.
 */
 #  define PNG_get_uint_16(buf) \
 ((png_uint_16) \
 (((unsigned int)(*(buf)) << 8) + \
 ((unsigned int)(*((buf) + 1)))))
 #  define PNG_get_int_32(buf) \
 ((png_int_32)((*(buf) & 0x80) \
 ? -((png_int_32)(((png_get_uint_32(buf)^0xffffffffU)+1U)&0x7fffffffU)) \
 : (png_int_32)png_get_uint_32(buf)))
 /* If PNG_PREFIX is defined the same thing as below happens in pnglibconf.h,
 * but defining a macro name prefixed with PNG_PREFIX.
 */
 #  ifndef PNG_PREFIX
-#     define png_get_uint_32(buf) PNG_get_uint_32(buf)
+#    define png_get_uint_32(buf) PNG_get_uint_32(buf)
-#     define png_get_uint_16(buf) PNG_get_uint_16(buf)
+#    define png_get_uint_16(buf) PNG_get_uint_16(buf)
-#     define png_get_int_32(buf)  PNG_get_int_32(buf)
+#    define png_get_int_32(buf)  PNG_get_int_32(buf)
 #  endif
 #else
 #  ifdef PNG_PREFIX
 /* No macros; revert to the (redefined) function */
-#     define PNG_get_uint_32 (png_get_uint_32)
+#    define PNG_get_uint_32 (png_get_uint_32)
-#     define PNG_get_uint_16 (png_get_uint_16)
+#    define PNG_get_uint_16 (png_get_uint_16)
-#     define PNG_get_int_32  (png_get_int_32)
+#    define PNG_get_int_32  (png_get_int_32)
 #  endif
 #endif
 #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
 PNG_EXPORT(242, void, png_set_check_for_invalid_index,
 /* An upper bound on the size of the data in the PNG IDAT chunks. */
 #define PNG_IMAGE_PNG_SIZE_MAX_(image, image_size)\
 ((8U/*sig*/+25U/*IHDR*/+16U/*gAMA*/+44U/*cHRM*/+12U/*IEND*/+\
 (((image).format&PNG_FORMAT_FLAG_COLORMAP)?/*colormap: PLTE, tRNS*/\
 12U+3U*(image).colormap_entries/*PLTE data*/+\
 (((image).format&PNG_FORMAT_FLAG_ALPHA)?\
 12U/*tRNS*/+(image).colormap_entries:0U):0U)+\
 12U)+(12U*((image_size)/PNG_ZBUF_SIZE))/*IDAT*/+(image_size))
 /* A helper for the following macro; if your compiler cannot handle the
 * following macro use this one with the result of
 * PNG_IMAGE_COMPRESSED_SIZE_MAX(image) as the second argument (most
 * compilers should handle this just fine.)
 #ifdef PNG_ARM_NEON_API_SUPPORTED
 #  define PNG_ARM_NEON   0 /* HARDWARE: ARM Neon SIMD instructions supported */
 #endif
 #define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */
 #define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */
-#define PNG_OPTION_NEXT  6 /* Next option - numbers must be even */
+#ifdef PNG_MIPS_MSA_API_SUPPORTED
+#  define PNG_MIPS_MSA   6 /* HARDWARE: MIPS Msa SIMD instructions supported */
+#endif
+#define PNG_IGNORE_ADLER32 8
+#define PNG_OPTION_NEXT  10 /* 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 */
 #define PNG_OPTION_INVALID 1 /* Option number out of range */
 #define PNG_OPTION_OFF     2

changeset 43321	2b8d397c03a4
parent 40436	94ae0ede53a5