libpng updated to 1.6.15

git-svn-id: http://svn.miranda-ng.org/main/trunk@11507 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 56 insertions, 39 deletions

diff --git a/plugins/AdvaImg/src/LibPNG/png.h b/plugins/AdvaImg/src/LibPNG/png.h
index 77bffe6b40..731816665e 100644
--- a/plugins/AdvaImg/src/LibPNG/png.h
+++ b/plugins/AdvaImg/src/LibPNG/png.h
@@ -1,7 +1,7 @@
 

 /* png.h - header file for PNG reference library

  *

- * libpng version 1.6.10 - March 6, 2014

+ * libpng version 1.6.15, November 20, 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.10 - March 6, 2014: Glenn

+ *   libpng versions 0.97, January 1998, through 1.6.15, November 20, 2014: Glenn

  *   See also "Contributing Authors", below.

  *

  * Note about libpng version numbers:

@@ -193,8 +193,22 @@
  *    1.6.9rc01-02            16    10609  16.so.16.9[.0]

  *    1.6.9                   16    10609  16.so.16.9[.0]

  *    1.6.10beta01-03         16    10610  16.so.16.10[.0]

- *    1.6.10betarc01-04       16    10610  16.so.16.10[.0]

- *    1.6.10beta              16    10610  16.so.16.10[.0]

+ *    1.6.10rc01-03           16    10610  16.so.16.10[.0]

+ *    1.6.10                  16    10610  16.so.16.10[.0]

+ *    1.6.11beta01-06         16    10611  16.so.16.11[.0]

+ *    1.6.11rc01-02           16    10611  16.so.16.11[.0]

+ *    1.6.11                  16    10611  16.so.16.11[.0]

+ *    1.6.12rc01-03           16    10612  16.so.16.12[.0]

+ *    1.6.12                  16    10612  16.so.16.12[.0]

+ *    1.6.13beta01-04         16    10613  16.so.16.13[.0]

+ *    1.6.13rc01-02           16    10613  16.so.16.13[.0]

+ *    1.6.13                  16    10613  16.so.16.13[.0]

+ *    1.6.14beta01-07         16    10614  16.so.16.14[.0]

+ *    1.6.14rc01-02           16    10614  16.so.16.14[.0]

+ *    1.6.14                  16    10614  16.so.16.14[.0]

+ *    1.6.15beta01-08         16    10615  16.so.16.15[.0]

+ *    1.6.15rc01-03           16    10615  16.so.16.15[.0]

+ *    1.6.15                  16    10615  16.so.16.15[.0]

  *

  *   Henceforth the source version will match the shared-library major

  *   and minor numbers; the shared-library major version number will be

@@ -226,8 +240,8 @@
  *

  * This code is released under the libpng license.

  *

- * libpng versions 1.2.6, August 15, 2004, through 1.6.10, March 6, 2014, are

- * Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are

+ * libpng versions 1.2.6, August 15, 2004, through 1.6.15, November 20, 2014, are

+ * Copyright (c) 2004, 2006-2014 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:

  *

@@ -338,13 +352,13 @@
  * Y2K compliance in libpng:

  * =========================

  *

- *    March 6, 2014

+ *    November 20, 2014

  *

  *    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.10 are Y2K compliant.  It is my belief that

+ *    upward through 1.6.15 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

@@ -397,16 +411,18 @@
 /* This is not the place to learn how to use libpng. The file libpng-manual.txt

  * describes how to use libpng, and the file example.c summarizes it

  * with some code on which to build.  This file is useful for looking

- * at the actual function definitions and structure components.

+ * at the actual function definitions and structure components.  If that

+ * file has been stripped from your copy of libpng, you can find it at

+ * <http://www.libpng.org/pub/png/libpng-manual.txt>

  *

  * 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.10"

+#define PNG_LIBPNG_VER_STRING "1.6.15"

 #define PNG_HEADER_VERSION_STRING \

-     " libpng version 1.6.10 - March 6, 2014\n"

+     " libpng version 1.6.15 - November 20, 2014\n"

 

 #define PNG_LIBPNG_VER_SONUM   16

 #define PNG_LIBPNG_VER_DLLNUM  16

@@ -414,7 +430,7 @@
 /* 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 10

+#define PNG_LIBPNG_VER_RELEASE 15

 

 /* This should match the numeric part of the final component of

  * PNG_LIBPNG_VER_STRING, omitting any leading zero:

@@ -445,7 +461,7 @@
  * 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 10610 /* 1.6.10 */

+#define PNG_LIBPNG_VER 10615 /* 1.6.15 */

 

 /* Library configuration: these options cannot be changed after

  * the library has been built.

@@ -550,7 +566,7 @@ extern "C" {
 /* 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_10;

+typedef char* png_libpng_version_1_6_15;

 

 /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.

  *

@@ -1163,7 +1179,7 @@ PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime,
 

 /* Convert from time_t to png_time.  Uses gmtime() */

 PNG_EXPORT(25, void, png_convert_from_time_t, (png_timep ptime, time_t ttime));

-#endif /* PNG_CONVERT_tIME_SUPPORTED */

+#endif /* CONVERT_tIME */

 

 #ifdef PNG_READ_EXPAND_SUPPORTED

 /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */

@@ -1369,7 +1385,7 @@ PNG_EXPORT(39, void, png_set_filler, (png_structrp png_ptr, png_uint_32 filler,
 /* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */

 PNG_EXPORT(40, void, png_set_add_alpha, (png_structrp png_ptr,

     png_uint_32 filler, int flags));

-#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */

+#endif /* READ_FILLER || WRITE_FILLER */

 

 #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)

 /* Swap bytes in 16-bit depth files. */

@@ -1633,7 +1649,7 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
     (png_structrp png_ptr, int heuristic_method, int num_weights,

     png_const_fixed_point_p filter_weights,

     png_const_fixed_point_p filter_costs))

-#endif /*  PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */

+#endif /* WRITE_WEIGHTED_FILTER */

 

 /* Heuristic used for row filter selection.  These defines should NOT be

  * changed.

@@ -1689,7 +1705,7 @@ PNG_EXPORT(225, void, png_set_text_compression_window_bits,
 

 PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,

     int method));

-#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */

+#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */

 

 /* These next functions are called for input/output, memory, and error

  * handling.  They are in the file pngrio.c, pngwio.c, and pngerror.c,

@@ -1849,7 +1865,6 @@ PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structrp, int save));
  */

 PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));

 

-#ifdef PNG_READ_INTERLACING_SUPPORTED

 /* Function that combines rows.  'new_row' is a flag that should come from

  * the callback and be non-NULL if anything needs to be done; the library

  * stores its own version of the new data internally and ignores the passed

@@ -1857,8 +1872,7 @@ PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));
  */

 PNG_EXPORT(93, void, png_progressive_combine_row, (png_const_structrp png_ptr,

     png_bytep old_row, png_const_bytep new_row));

-#endif /* PNG_READ_INTERLACING_SUPPORTED */

-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */

+#endif /* PROGRESSIVE_READ */

 

 PNG_EXPORTA(94, png_voidp, png_malloc, (png_const_structrp png_ptr,

     png_alloc_size_t size), PNG_ALLOCATED);

@@ -2059,7 +2073,7 @@ PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
 PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,

     (png_const_structrp png_ptr, png_const_inforp info_ptr));

 

-#endif /* PNG_EASY_ACCESS_SUPPORTED */

+#endif /* EASY_ACCESS */

 

 #ifdef PNG_READ_SUPPORTED

 /* Returns pointer to signature string read from PNG header */

@@ -2311,7 +2325,7 @@ PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_const_structrp png_ptr,
 PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr,

     png_inforp info_ptr, int unit,

     png_const_charp swidth, png_const_charp sheight));

-#endif /* PNG_sCAL_SUPPORTED */

+#endif /* sCAL */

 

 #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED

 /* Provide the default handling for all unknown chunks or, optionally, for

@@ -2539,8 +2553,8 @@ PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
 PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structrp png_ptr,

     png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,

     int *unit_type));

-#  endif /* PNG_pHYs_SUPPORTED */

-#endif  /* PNG_INCH_CONVERSIONS_SUPPORTED */

+#  endif /* pHYs */

+#endif  /* INCH_CONVERSIONS */

 

 /* Added in libpng-1.4.0 */

 #ifdef PNG_IO_STATE_SUPPORTED

@@ -2563,7 +2577,7 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
 #  define PNG_IO_CHUNK_CRC   0x0080   /* currently at the chunk crc */

 #  define PNG_IO_MASK_OP     0x000f   /* current operation: reading/writing */

 #  define PNG_IO_MASK_LOC    0x00f0   /* current location: sig/hdr/data/crc */

-#endif /* ?PNG_IO_STATE_SUPPORTED */

+#endif /* IO_STATE */

 

 /* Interlace support.  The following macros are always defined so that if

  * libpng interlace handling is turned off the macros may be used to handle

@@ -2667,7 +2681,7 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
      (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \

      (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) +         \

      32767) / 65535)

-#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */

+#endif /* READ_COMPOSITE_NODIV */

 

 #ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED

 PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));

@@ -2737,6 +2751,8 @@ PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
 #  endif

 #endif

 

+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) || \

+    defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)

 /*******************************************************************************

  *  SIMPLIFIED API

  *******************************************************************************

@@ -2808,7 +2824,7 @@ typedef struct
 #  define PNG_IMAGE_WARNING 1

 #  define PNG_IMAGE_ERROR 2

    /*

-    * The result is a two bit code such that a value more than 1 indicates

+    * The result is a two-bit code such that a value more than 1 indicates

     * a failure in the API just called:

     *

     *    0 - no warning or error

@@ -3093,7 +3109,7 @@ PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
 PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,

    FILE* file));

    /* The PNG header is read from the stdio FILE object. */

-#endif /* PNG_STDIO_SUPPORTED */

+#endif /* STDIO */

 

 PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image,

    png_const_voidp memory, png_size_t size));

@@ -3138,7 +3154,7 @@ PNG_EXPORT(238, void, png_image_free, (png_imagep image));
    /* Free any data allocated by libpng in image->opaque, setting the pointer to

     * NULL.  May be called at any time after the structure is initialized.

     */

-#endif /* PNG_SIMPLIFIED_READ_SUPPORTED */

+#endif /* SIMPLIFIED_READ */

 

 #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED

 #ifdef PNG_STDIO_SUPPORTED

@@ -3184,11 +3200,12 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
  *

  * Note that the write API does not support interlacing or sub-8-bit pixels.

  */

-#endif /* PNG_STDIO_SUPPORTED */

-#endif /* PNG_SIMPLIFIED_WRITE_SUPPORTED */

+#endif /* STDIO */

+#endif /* SIMPLIFIED_WRITE */

 /*******************************************************************************

  *  END OF SIMPLIFIED API

  ******************************************************************************/

+#endif /* SIMPLIFIED_{READ|WRITE} */

 

 #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED

 PNG_EXPORT(242, void, png_set_check_for_invalid_index,

@@ -3225,7 +3242,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 */

@@ -3235,19 +3253,18 @@ PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
 

 PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,

    int onoff));

-#endif

+#endif /* SET_OPTION */

 

 /*******************************************************************************

- *  END OF HARDWARE OPTIONS

+ *  END OF HARDWARE AND SOFTWARE OPTIONS

  ******************************************************************************/

 

-/* Maintainer: Put new public prototypes here ^, in libpng.3, and project

- * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt

+/* Maintainer: Put new public prototypes here ^, in libpng.3, in project

+ * defs, and in scripts/symbols.def.

  */

 

 /* The last ordinal number (this is the *last* one already used; the next

- * one to use is one more than this.)  Maintainer, remember to add an entry to

- * scripts/symbols.def as well.

+ * one to use is one more than this.)

  */

 #ifdef PNG_EXPORT_LAST_ORDINAL

   PNG_EXPORT_LAST_ORDINAL(244);