potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

libpng: fix NEON

Browse Source
This commit is contained in:
Alexander Alekhin
2016-06-29 13:18:17 +03:00
parent 7c64e03cc9
commit babaa00ac1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
3rdparty/libpng/CMakeLists.txt
Vendored
+5 -3
View File
@@ -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()
# ----------------------------------------------------------------------------------