summaryrefslogtreecommitdiffstats
path: root/third_party/libpng/png.c
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-25 17:34:18 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-25 17:34:18 +0000
commit295105baa982733ebb2d59c448049c3eb52aa95c (patch)
tree3a0d43cbac5f8d57bd44f29782a0be2f090e44f2 /third_party/libpng/png.c
parent3a0cb84cb8aa37bcf6ee940eb3679b7f4554abdf (diff)
downloadchromium_src-295105baa982733ebb2d59c448049c3eb52aa95c.zip
chromium_src-295105baa982733ebb2d59c448049c3eb52aa95c.tar.gz
chromium_src-295105baa982733ebb2d59c448049c3eb52aa95c.tar.bz2
libpng: update to 1.2.44
r50937 updated the important bits of libpng to 1.2.44 but missed a few files. This change reduces the diffs between the upstream 1.2.44 and our copy to nothing (for *.c *.h). TEST=none BUG=none TBR=mhm git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63744 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libpng/png.c')
-rw-r--r--third_party/libpng/png.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/libpng/png.c b/third_party/libpng/png.c
index da611c9..7ad9538 100644
--- a/third_party/libpng/png.c
+++ b/third_party/libpng/png.c
@@ -17,7 +17,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_43 Your_png_h_is_not_version_1_2_43;
+typedef version_1_2_44 Your_png_h_is_not_version_1_2_44;
/* Version information for C files. This had better match the version
* string defined in png.h.
@@ -724,13 +724,13 @@ png_get_copyright(png_structp png_ptr)
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
- "libpng version 1.2.43 - February 25, 2010" PNG_STRING_NEWLINE \
+ "libpng version 1.2.44 - June 26, 2010" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE);
#else
- return ((png_charp) "libpng version 1.2.43 - February 25, 2010\
+ return ((png_charp) "libpng version 1.2.44 - June 26, 2010\
Copyright (c) 1998-2010 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");