Merge pull request opencv#7643 from alalek:libpng_aarch64

alalek · alalek · commit ad888c80cf27 · 2016-11-14T13:38:44.000Z
diff --git a/3rdparty/libpng/CMakeLists.txt b/3rdparty/libpng/CMakeLists.txt
@@ -31,6 +31,8 @@ file(GLOB lib_hdrs *.h)
 if(ENABLE_NEON)
   list(APPEND lib_srcs arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c)
   add_definitions(-DPNG_ARM_NEON_OPT=2)
+elseif(AARCH64)
+  add_definitions(-DPNG_ARM_NEON_OPT=0) # NEON assembler is not supported
 endif()
 
 if(ENABLE_SSE
