| Index: third_party/libpng/png.h
|
| ===================================================================
|
| --- third_party/libpng/png.h (revision 7204)
|
| +++ third_party/libpng/png.h (working copy)
|
| @@ -1,6 +1,6 @@
|
| /* png.h - header file for PNG reference library
|
| *
|
| - * libpng version 1.2.29 - May 8, 2008
|
| + * libpng version 1.2.33 - October 31, 2008
|
| * Copyright (c) 1998-2008 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.)
|
| @@ -8,7 +8,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.2.29 - May 8, 2008: Glenn
|
| + * libpng versions 0.97, January 1998, through 1.2.33 - October 31, 2008: Glenn
|
| * See also "Contributing Authors", below.
|
| *
|
| * Note about libpng version numbers:
|
| @@ -192,6 +192,26 @@
|
| * 1.2.29rc01 13 10229 12.so.0.29[.0]
|
| * 1.0.35 10 10035 10.so.0.35[.0]
|
| * 1.2.29 13 10229 12.so.0.29[.0]
|
| + * 1.0.37 10 10037 10.so.0.37[.0]
|
| + * 1.2.30beta01-04 13 10230 12.so.0.30[.0]
|
| + * 1.0.38rc01-08 10 10038 10.so.0.38[.0]
|
| + * 1.2.30rc01-08 13 10230 12.so.0.30[.0]
|
| + * 1.0.38 10 10038 10.so.0.38[.0]
|
| + * 1.2.30 13 10230 12.so.0.30[.0]
|
| + * 1.0.39rc01-03 10 10039 10.so.0.39[.0]
|
| + * 1.2.31rc01-03 13 10231 12.so.0.31[.0]
|
| + * 1.0.39 10 10039 10.so.0.39[.0]
|
| + * 1.2.31 13 10231 12.so.0.31[.0]
|
| + * 1.2.32beta01-02 13 10232 12.so.0.32[.0]
|
| + * 1.0.40rc01 10 10040 10.so.0.40[.0]
|
| + * 1.2.32rc01 13 10232 12.so.0.32[.0]
|
| + * 1.0.40 10 10040 10.so.0.40[.0]
|
| + * 1.2.32 13 10232 12.so.0.32[.0]
|
| + * 1.2.33beta01-02 13 10233 12.so.0.33[.0]
|
| + * 1.2.33rc01-02 13 10233 12.so.0.33[.0]
|
| + * 1.0.41rc01 10 10041 10.so.0.41[.0]
|
| + * 1.2.33 13 10233 12.so.0.33[.0]
|
| + * 1.0.41 10 10041 10.so.0.41[.0]
|
| *
|
| * Henceforth the source version will match the shared-library major
|
| * and minor numbers; the shared-library major version number will be
|
| @@ -221,7 +241,7 @@
|
| * If you modify libpng you may insert additional notices immediately following
|
| * this sentence.
|
| *
|
| - * libpng versions 1.2.6, August 15, 2004, through 1.2.29, May 8, 2008, are
|
| + * libpng versions 1.2.6, August 15, 2004, through 1.2.33, October 31, 2008, are
|
| * Copyright (c) 2004, 2006-2008 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:
|
| @@ -333,13 +353,13 @@
|
| * Y2K compliance in libpng:
|
| * =========================
|
| *
|
| - * May 8, 2008
|
| + * October 31, 2008
|
| *
|
| * 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.2.29 are Y2K compliant. It is my belief that earlier
|
| + * upward through 1.2.33 are Y2K compliant. It is my belief that earlier
|
| * versions were also Y2K compliant.
|
| *
|
| * Libpng only has three year fields. One is a 2-byte unsigned integer
|
| @@ -395,9 +415,9 @@
|
| */
|
|
|
| /* Version information for png.h - this should match the version in png.c */
|
| -#define PNG_LIBPNG_VER_STRING "1.2.29"
|
| +#define PNG_LIBPNG_VER_STRING "1.2.33"
|
| #define PNG_HEADER_VERSION_STRING \
|
| - " libpng version 1.2.29 - May 8, 2008\n"
|
| + " libpng version 1.2.33 - October 31, 2008\n"
|
|
|
| #define PNG_LIBPNG_VER_SONUM 0
|
| #define PNG_LIBPNG_VER_DLLNUM 13
|
| @@ -405,7 +425,7 @@
|
| /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
|
| #define PNG_LIBPNG_VER_MAJOR 1
|
| #define PNG_LIBPNG_VER_MINOR 2
|
| -#define PNG_LIBPNG_VER_RELEASE 29
|
| +#define PNG_LIBPNG_VER_RELEASE 33
|
| /* This should match the numeric part of the final component of
|
| * PNG_LIBPNG_VER_STRING, omitting any leading zero: */
|
|
|
| @@ -433,7 +453,7 @@
|
| * 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 10229 /* 1.2.29 */
|
| +#define PNG_LIBPNG_VER 10233 /* 1.2.33 */
|
|
|
| #ifndef PNG_VERSION_INFO_ONLY
|
| /* include the compression library's header */
|
| @@ -1204,7 +1224,7 @@
|
| png_uint_32 row_number; /* current row in interlace pass */
|
| png_bytep prev_row; /* buffer to save previous (unfiltered) row */
|
| png_bytep row_buf; /* buffer to save current (unfiltered) row */
|
| -#ifndef PNG_NO_WRITE_FILTERING
|
| +#ifndef PNG_NO_WRITE_FILTER
|
| png_bytep sub_row; /* buffer to save "sub" row when filtering */
|
| png_bytep up_row; /* buffer to save "up" row when filtering */
|
| png_bytep avg_row; /* buffer to save "avg" row when filtering */
|
| @@ -1444,13 +1464,17 @@
|
|
|
| /* New members added in libpng-1.2.26 */
|
| png_uint_32 old_big_row_buf_size, old_prev_row_size;
|
| +
|
| +/* New member added in libpng-1.2.30 */
|
| + png_charp chunkdata; /* buffer for reading chunk data */
|
| +
|
| };
|
|
|
|
|
| /* This triggers a compiler error in png.c, if png.c and png.h
|
| * do not agree upon the version number.
|
| */
|
| -typedef png_structp version_1_2_29;
|
| +typedef png_structp version_1_2_33;
|
|
|
| typedef png_struct FAR * FAR * png_structpp;
|
|
|
| @@ -2645,6 +2669,7 @@
|
| png_ptr));
|
| #endif
|
|
|
| +
|
| /* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */
|
|
|
| #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
|
| @@ -3026,8 +3051,8 @@
|
| /* Decompress data in a chunk that uses compression */
|
| #if defined(PNG_zTXt_SUPPORTED) || defined(PNG_iTXt_SUPPORTED) || \
|
| defined(PNG_iCCP_SUPPORTED) || defined(PNG_sPLT_SUPPORTED)
|
| -PNG_EXTERN png_charp png_decompress_chunk PNGARG((png_structp png_ptr,
|
| - int comp_type, png_charp chunkdata, png_size_t chunklength,
|
| +PNG_EXTERN void png_decompress_chunk PNGARG((png_structp png_ptr,
|
| + int comp_type, png_size_t chunklength,
|
| png_size_t prefix_length, png_size_t *data_length));
|
| #endif
|
|
|
| @@ -3556,6 +3581,9 @@
|
| #endif /* PNG_pHYs_SUPPORTED */
|
| #endif /* PNG_INCH_CONVERSIONS && PNG_FLOATING_POINT_SUPPORTED */
|
|
|
| +/* Read the chunk header (length + type name) */
|
| +PNG_EXTERN png_uint_32 png_read_chunk_header PNGARG((png_structp png_ptr));
|
| +
|
| /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
|
|
|
| #endif /* PNG_INTERNAL */
|
|
|