aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2017-10-06 11:02:56 -0400
committerLeon Scroggins III <scroggo@google.com>2017-10-06 11:58:29 -0400
commit3cc83ac4b563ffa7a1bae9572f5fc3c1ee5f8a10 (patch)
treece10938bd99d8eb3b6a808d4dceaaf1de0348990 /LICENSE
parent772123003e7fb8268251b418f559f71d8d4c202c (diff)
downloadlibpng-3cc83ac4b563ffa7a1bae9572f5fc3c1ee5f8a10.tar.gz
Update to 1.6.34
Test: Covered by existing tests. This is the same version we will use in Chromium: https://chromium-review.googlesource.com/c/chromium/src/+/704209 https://github.com/glennrp/libpng/commit/edef058e180be435afd8feebb742a22360a7fa3f (included in this revision) moved the SSE opts directly into the main libpng source, so contrib/intel/intel_sse.patch is no longer necessary, as its changes are already included. Adds *all* code, rather than selecting just the code we use. Other changes: - README.android: - Update version - Android.mk -> Android.bp - Remove no longer relevant comment about applying the intel patch - Remove comment about deleting unused files - README.version: - Update version and source link Change-Id: Ib24cfcfec3e2f63eed8b3b9f0920b1018b30dd64
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE9
1 files changed, 6 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE
index d48a293cd..4cda4fa0a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,8 +10,8 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000 through 1.6.25, September 1, 2016 are
-Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
+libpng versions 1.0.7, July 1, 2000 through 1.6.34, September 29, 2017 are
+Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
derived from libpng-1.0.6, and are distributed according to the same
disclaimer and license as libpng-1.0.6 with the following individuals
added to the list of Contributing Authors:
@@ -22,6 +22,9 @@ added to the list of Contributing Authors:
Cosmin Truta
Gilles Vollant
James Yu
+ Mandar Sahastrabuddhe
+ Google Inc.
+ Vadim Barkov
and with the following additions to the disclaimer:
@@ -127,4 +130,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-September 1, 2016
+September 29, 2017