diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2013-11-14 09:16:37 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2013-11-14 12:28:22 -0600 |
commit | a066d49b01fa7d134a946475534d50f62d97225a (patch) | |
tree | a54c485c3512b3c5baaba347c1792041947519b8 /png.h | |
parent | 05f3788b7a7ceed1616a0f5e4e754a84671ed5e6 (diff) | |
download | libpng-a066d49b01fa7d134a946475534d50f62d97225a.tar.gz |
[master] Imported from libpng-1.6.7.tar
Diffstat (limited to 'png.h')
-rw-r--r-- | png.h | 26 |
1 files changed, 15 insertions, 11 deletions
@@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.5 - September 14, 2013 + * libpng version 1.6.7 - November 14, 2013 * Copyright (c) 1998-2013 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.5 - September 14, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.7 - November 14, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -182,6 +182,9 @@ * 1.6.4rc01 16 10604 16.so.16.4[.0] * 1.6.4 16 10604 16.so.16.4[.0] * 1.6.5 16 10605 16.so.16.5[.0] + * 1.6.6 16 10606 16.so.16.6[.0] + * 1.6.7beta01-04 16 10607 16.so.16.7[.0] + * 1.6.7rc01-03 16 10607 16.so.16.7[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -213,7 +216,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.5, September 14, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.7, November 14, 2013, 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: @@ -325,13 +328,13 @@ * Y2K compliance in libpng: * ========================= * - * September 14, 2013 + * November 14, 2013 * * 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.5 are Y2K compliant. It is my belief that + * upward through 1.6.7 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 @@ -391,9 +394,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.5" +#define PNG_LIBPNG_VER_STRING "1.6.7" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.5 - September 14, 2013\n" + " libpng version 1.6.7 - November 14, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -401,7 +404,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 5 +#define PNG_LIBPNG_VER_RELEASE 7 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: @@ -432,7 +435,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 10605 /* 1.6.5 */ +#define PNG_LIBPNG_VER 10607 /* 1.6.7 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -537,7 +540,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_5; +typedef char* png_libpng_version_1_6_7; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * @@ -719,7 +722,8 @@ typedef png_time * png_timep; typedef const png_time * png_const_timep; typedef png_time * * png_timepp; -#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED +#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) ||\ + defined(PNG_USER_CHUNKS_SUPPORTED) /* png_unknown_chunk is a structure to hold queued chunks for which there is * no specific support. The idea is that we can use this to queue * up private chunks for output even though the library doesn't actually |