diff options
| author | thestig <thestig@chromium.org> | 2016-08-03 16:29:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-03 16:29:18 -0700 |
| commit | 6d5c56b44d1821a715f4496668373ac6d1f1d3c6 (patch) | |
| tree | 8eea2b264c779be6c35ddaa33f1496dd73300167 /third_party/libpng16/png.c | |
| parent | 96a07863120273c8b89cba0e7d53ef29ae56d580 (diff) | |
| download | pdfium-6d5c56b44d1821a715f4496668373ac6d1f1d3c6.tar.xz | |
Update libpng to 1.6.22.
Sync up with Chromium's copy of libpng.
Review-Url: https://codereview.chromium.org/2132263002
Diffstat (limited to 'third_party/libpng16/png.c')
| -rw-r--r-- | third_party/libpng16/png.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/third_party/libpng16/png.c b/third_party/libpng16/png.c index 1cf5271046..35e14f63d8 100644 --- a/third_party/libpng16/png.c +++ b/third_party/libpng16/png.c @@ -2,7 +2,7 @@ /* png.c - location for general purpose libpng functions * * Last changed in libpng 1.6.19 [November 12, 2015] - * Copyright (c) 1998-2015 Glenn Randers-Pehrson + * Copyright (c) 1998-2002,2004,2006-2015 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.) * @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_20 Your_png_h_is_not_version_1_6_20; +typedef png_libpng_version_1_6_22 Your_png_h_is_not_version_1_6_22; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -775,14 +775,15 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.20 - December 3, 2015" PNG_STRING_NEWLINE \ - "Copyright (c) 1998-2015 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ + "libpng version 1.6.22 - May 26, 2016" PNG_STRING_NEWLINE \ + "Copyright (c) 1998-2002,2004,2006-2016 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 "libpng version 1.6.20 - December 3, 2015\ - Copyright (c) 1998-2015 Glenn Randers-Pehrson\ + return "libpng version 1.6.22 - May 26, 2016\ + Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; # endif |