[opencv] 23/71: Merge pull request #6743 from alalek:libpng_24

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.1
in repository opencv.

commit 8865528dc257c0e0ffdc1905b5ded3329e004248
Merge: 1432471 babaa00
Author: Alexander Alekhin <alexander.alekhin at itseez.com>
Date:   Fri Jul 1 10:27:57 2016 +0000

    Merge pull request #6743 from alalek:libpng_24

 3rdparty/libpng/CMakeLists.txt      |  10 +-
 3rdparty/libpng/LICENSE             |  73 +++--
 3rdparty/libpng/README              |  61 ++--
 3rdparty/libpng/arm/arm_init.c      | 232 ++++++++++++++
 3rdparty/libpng/opencv-libpng.patch |   6 +-
 3rdparty/libpng/png.c               | 374 ++++++++++++----------
 3rdparty/libpng/png.h               | 556 +++++++++++++++------------------
 3rdparty/libpng/pngconf.h           |  66 ++--
 3rdparty/libpng/pngdebug.h          |  22 +-
 3rdparty/libpng/pngerror.c          |  13 +-
 3rdparty/libpng/pngget.c            |  66 +++-
 3rdparty/libpng/pnginfo.h           |   7 +-
 3rdparty/libpng/pnglibconf.h        | 157 +++++-----
 3rdparty/libpng/pngmem.c            |  12 +-
 3rdparty/libpng/pngpread.c          | 128 ++------
 3rdparty/libpng/pngpriv.h           | 244 ++++++++++-----
 3rdparty/libpng/pngread.c           |  33 +-
 3rdparty/libpng/pngrio.c            |   4 +-
 3rdparty/libpng/pngrtran.c          | 210 ++++++++-----
 3rdparty/libpng/pngrutil.c          | 200 ++++++------
 3rdparty/libpng/pngset.c            | 250 +++++++++++----
 3rdparty/libpng/pngstruct.h         |  21 +-
 3rdparty/libpng/pngtrans.c          |  12 +-
 3rdparty/libpng/pngwio.c            |   6 +-
 3rdparty/libpng/pngwrite.c          | 414 ++++++------------------
 3rdparty/libpng/pngwtran.c          |  20 +-
 3rdparty/libpng/pngwutil.c          | 605 ++++--------------------------------
 3rdparty/readme.txt                 |   4 +-
 28 files changed, 1775 insertions(+), 2031 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git