Skip to content

Commit d4e2e62

Browse files
sturkmen72alalek
authored andcommitted
3rdparty: update libpng 1.6.34
1 parent 197078e commit d4e2e62

31 files changed

+1555
-1011
lines changed

3rdparty/libpng/CHANGES

Lines changed: 368 additions & 2 deletions
Large diffs are not rendered by default.

3rdparty/libpng/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ if(ARM OR AARCH64)
3737
endif()
3838
endif()
3939

40-
if(ENABLE_SSE
40+
if(";${CPU_BASELINE_FINAL};" MATCHES "SSE2"
4141
AND (NOT MSVC OR (MSVC_VERSION GREATER 1799))) # MSVS2013+ (issue #7232)
42-
list(APPEND lib_srcs contrib/intel/intel_init.c contrib/intel/filter_sse2_intrinsics.c)
42+
list(APPEND lib_srcs intel/intel_init.c intel/filter_sse2_intrinsics.c)
4343
add_definitions(-DPNG_INTEL_SSE)
4444
endif()
4545

3rdparty/libpng/LICENSE

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ this sentence.
1010

1111
This code is released under the libpng license.
1212

13-
libpng versions 1.0.7, July 1, 2000 through 1.6.24, August 4, 2016 are
14-
Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
13+
libpng versions 1.0.7, July 1, 2000 through 1.6.34, September 29, 2017 are
14+
Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
1515
derived from libpng-1.0.6, and are distributed according to the same
1616
disclaimer and license as libpng-1.0.6 with the following individuals
1717
added to the list of Contributing Authors:
@@ -22,6 +22,9 @@ added to the list of Contributing Authors:
2222
Cosmin Truta
2323
Gilles Vollant
2424
James Yu
25+
Mandar Sahastrabuddhe
26+
Google Inc.
27+
Vadim Barkov
2528

2629
and with the following additions to the disclaimer:
2730

@@ -127,4 +130,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and
127130

128131
Glenn Randers-Pehrson
129132
glennrp at users.sourceforge.net
130-
August 4, 2016
133+
September 29, 2017

3rdparty/libpng/README

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
README for libpng version 1.6.24 - August 4, 2016 (shared library 16.0)
1+
README for libpng version 1.6.34 - September 29, 2017 (shared library 16.0)
22
See the note about version numbers near the top of png.h
33

44
See INSTALL for instructions on how to install libpng.
@@ -23,7 +23,7 @@ earlier versions if you are using a shared library. The type of the
2323
png_uint_32, which will affect shared-library applications that use
2424
this function.
2525

26-
To avoid problems with changes to the internals of png info_struct,
26+
To avoid problems with changes to the internals of the png info_struct,
2727
new APIs have been made available in 0.95 to avoid direct application
2828
access to info_ptr. These functions are the png_set_<chunk> and
2929
png_get_<chunk> functions. These functions should be used when
@@ -88,11 +88,11 @@ zlib should be available at the same place that libpng is, or at zlib.net.
8888

8989
You may also want a copy of the PNG specification. It is available
9090
as an RFC, a W3C Recommendation, and an ISO/IEC Standard. You can find
91-
these at http://www.libpng.org/pub/png/documents/
91+
these at http://www.libpng.org/pub/png/pngdocs.html .
9292

93-
This code is currently being archived at libpng.sf.net in the
94-
[DOWNLOAD] area, and at ftp://ftp.simplesystems.org. If you can't find it
95-
in any of those places, e-mail me, and I'll help you find it.
93+
This code is currently being archived at libpng.sourceforge.io in the
94+
[DOWNLOAD] area, and at http://libpng.download/src . If you
95+
can't find it in any of those places, e-mail me, and I'll help you find it.
9696

9797
I am not a lawyer, but I believe that the Export Control Classification
9898
Number (ECCN) for libpng is EAR99, which means not subject to export
@@ -179,18 +179,25 @@ Files in this distribution:
179179
pngwtran.c => Write data transformations
180180
pngwutil.c => Write utility functions
181181
arm => Contains optimized code for the ARM platform
182+
powerpc => Contains optimized code for the PowerPC platform
182183
contrib => Contributions
184+
arm-neon => Optimized code for ARM-NEON platform
185+
powerpc-vsx => Optimized code for POWERPC-VSX platform
183186
examples => Example programs
184187
gregbook => source code for PNG reading and writing, from
185188
Greg Roelofs' "PNG: The Definitive Guide",
186189
O'Reilly, 1999
187190
libtests => Test programs
191+
mips-msa => Optimized code for MIPS-MSA platform
188192
pngminim => Minimal decoder, encoder, and progressive decoder
189193
programs demonstrating use of pngusr.dfa
190194
pngminus => Simple pnm2png and png2pnm programs
191195
pngsuite => Test images
196+
testpngs
192197
tools => Various tools
193198
visupng => Contains a MSVC workspace for VisualPng
199+
intel => Optimized code for INTEL-SSE2 platform
200+
mips => Optimized code for MIPS platform
194201
projects => Contains project files and workspaces for
195202
building a DLL
196203
owatcom => Contains a WATCOM project for building libpng

3rdparty/libpng/arm/filter_neon.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
/* filter_neon.S - NEON optimised filter functions
33
*
4-
* Copyright (c) 2014 Glenn Randers-Pehrson
4+
* Copyright (c) 2014,2017 Glenn Randers-Pehrson
55
* Written by Mans Rullgard, 2011.
6-
* Last changed in libpng 1.6.16 [December 22, 2014]
6+
* Last changed in libpng 1.6.31 [July 27, 2017]
77
*
88
* This code is released under the libpng license.
99
* For conditions of distribution and use, see the disclaimer
@@ -16,7 +16,7 @@
1616
#define PNG_VERSION_INFO_ONLY
1717
#include "../pngpriv.h"
1818

19-
#if defined(__linux__) && defined(__ELF__)
19+
#if (defined(__linux__) || defined(__FreeBSD__)) && defined(__ELF__)
2020
.section .note.GNU-stack,"",%progbits /* mark stack as non-executable */
2121
#endif
2222

3rdparty/libpng/contrib/intel/INSTALL

Lines changed: 0 additions & 158 deletions
This file was deleted.

0 commit comments

Comments
 (0)