[opencv] 21/71: libpng: fix NEON

[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 babaa00ac11e84a4e7932a72a69c7667f7fea725
Author: Alexander Alekhin <alexander.alekhin at itseez.com>
Date:   Wed Jun 29 13:18:17 2016 +0300

    libpng: fix NEON
---
 3rdparty/libpng/CMakeLists.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/3rdparty/libpng/CMakeLists.txt b/3rdparty/libpng/CMakeLists.txt
index 76ead5d..bd243c3 100644
--- a/3rdparty/libpng/CMakeLists.txt
+++ b/3rdparty/libpng/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # ----------------------------------------------------------------------------
 
-if(NEON)
+if(ARM AND ENABLE_NEON AND NOT AARCH64)
   project(${PNG_LIBRARY} ASM)
 else()
   project(${PNG_LIBRARY})
@@ -14,9 +14,11 @@ ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}" ${ZLIB_INCLUDE_DIR})
 file(GLOB lib_srcs *.c)
 file(GLOB lib_hdrs *.h)
 
-if(ARM AND NEON)
+if(ARM AND ENABLE_NEON AND NOT AARCH64)
   list(APPEND lib_srcs arm/filter_neon.S arm/arm_init.c)
-  add_definitions(-DPNG_ARM_NEON)
+  add_definitions(-DPNG_ARM_NEON_OPT=2)
+else()
+  add_definitions(-DPNG_ARM_NEON_OPT=0)
 endif()
 
 # ----------------------------------------------------------------------------------

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