summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libpng/pngmem.c
diff options
context:
space:
mode:
authorAndré Klitzing <aklitzing@gmail.com>2018-12-27 09:51:50 +0100
committerAndré Klitzing <aklitzing@gmail.com>2019-01-16 15:15:25 +0000
commit5d8b01468e8bd752dad090aaef4ccf3a83a58a0d (patch)
tree6078ea965b040c79f5660af27a216957d3135185 /src/3rdparty/libpng/pngmem.c
parent61af5abb33f98039733492633f5bf4b56efc9972 (diff)
Update bundled libpng to version 1.6.36
The remaining diff to clean 1.6.36 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] libpng was updated to version 1.6.36 Change-Id: Ia9d20c5abca115d509ed0aaf9eebfc85a88bef1d Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/3rdparty/libpng/pngmem.c')
-rw-r--r--src/3rdparty/libpng/pngmem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/libpng/pngmem.c b/src/3rdparty/libpng/pngmem.c
index ff3ef7e88c..09ed9c1c99 100644
--- a/src/3rdparty/libpng/pngmem.c
+++ b/src/3rdparty/libpng/pngmem.c
@@ -1,10 +1,10 @@
/* pngmem.c - stub functions for memory allocation
*
- * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 2018 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2014,2016 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.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer