diff options
author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 15:09:46 +0000 |
---|---|---|
committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 15:09:46 +0000 |
commit | 587b8066b4d994a10986fbeef624aba4c69b4cfe (patch) | |
tree | 3e8a2c661c7e335503754308b12c615dd8f0d73b /third_party/libpng/png.h | |
parent | f5aaec32f75fe1c65030bc661c58360c3f22c21e (diff) | |
download | chromium_src-587b8066b4d994a10986fbeef624aba4c69b4cfe.zip chromium_src-587b8066b4d994a10986fbeef624aba4c69b4cfe.tar.gz chromium_src-587b8066b4d994a10986fbeef624aba4c69b4cfe.tar.bz2 |
Revert "Revert "libpng: update to 1.2.44""
This reverts commit r64079. The perf regression turned out not to be the fault
of the libpng change.
BUG=60942
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64243 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libpng/png.h')
-rw-r--r-- | third_party/libpng/png.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/third_party/libpng/png.h b/third_party/libpng/png.h index 1ed5426..cc1915d 100644 --- a/third_party/libpng/png.h +++ b/third_party/libpng/png.h @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.43 - February 25, 2010 + * libpng version 1.2.44 - June 26, 2010 * Copyright (c) 1998-2010 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.) @@ -10,7 +10,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.43 - February 25, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.2.44 - June 26, 2010: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -293,7 +293,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.43, February 25, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.44, June 26, 2010, are * Copyright (c) 2004, 2006-2010 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: @@ -405,13 +405,13 @@ * Y2K compliance in libpng: * ========================= * - * February 25, 2010 + * June 26, 2010 * * 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.43 are Y2K compliant. It is my belief that earlier + * upward through 1.2.44 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 @@ -467,9 +467,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.43" +#define PNG_LIBPNG_VER_STRING "1.2.44" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.43 - February 25, 2010\n" + " libpng version 1.2.44 - June 26, 2010\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -477,7 +477,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 43 +#define PNG_LIBPNG_VER_RELEASE 44 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ @@ -507,7 +507,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 10243 /* 1.2.43 */ +#define PNG_LIBPNG_VER 10244 /* 1.2.44 */ #ifndef PNG_VERSION_INFO_ONLY /* Include the compression library's header */ @@ -1547,7 +1547,7 @@ struct png_struct_def /* 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_43; +typedef png_structp version_1_2_44; typedef png_struct FAR * FAR * png_structpp; |