56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
|
From d0a22d8de37e0bdbd85d606080671c66ddb8577b Mon Sep 17 00:00:00 2001
|
||
|
|
From: weidong <weidong@uniontech.com>
|
||
|
|
Date: Thu, 10 Sep 2020 17:53:17 +0800
|
||
|
|
Subject: [PATCH] fix error
|
||
|
|
|
||
|
|
---
|
||
|
|
Source/LibPNG/configure | 4 ++++
|
||
|
|
Source/LibPNG/pngpriv.h | 2 +-
|
||
|
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/Source/LibPNG/configure b/Source/LibPNG/configure
|
||
|
|
index 472b35e2..76e8fda6 100644
|
||
|
|
--- a/Source/LibPNG/configure
|
||
|
|
+++ b/Source/LibPNG/configure
|
||
|
|
@@ -13575,20 +13575,24 @@ if test "${enable_arm_neon+set}" = set; then :
|
||
|
|
no|off)
|
||
|
|
# disable the default enabling on __ARM_NEON__ systems:
|
||
|
|
|
||
|
|
+$as_echo "#define PNG_USE_ARM_NEON /**/" >>confdefs.h
|
||
|
|
$as_echo "#define PNG_ARM_NEON_OPT 0" >>confdefs.h
|
||
|
|
|
||
|
|
# Prevent inclusion of the assembler files below:
|
||
|
|
enable_arm_neon=no;;
|
||
|
|
check)
|
||
|
|
|
||
|
|
+$as_echo "#define PNG_USE_ARM_NEON /**/" >>confdefs.h
|
||
|
|
$as_echo "#define PNG_ARM_NEON_CHECK_SUPPORTED /**/" >>confdefs.h
|
||
|
|
;;
|
||
|
|
api)
|
||
|
|
|
||
|
|
+$as_echo "#define PNG_USE_ARM_NEON /**/" >>confdefs.h
|
||
|
|
$as_echo "#define PNG_ARM_NEON_API_SUPPORTED /**/" >>confdefs.h
|
||
|
|
;;
|
||
|
|
yes|on)
|
||
|
|
|
||
|
|
+$as_echo "#define PNG_USE_ARM_NEON /**/" >>confdefs.h
|
||
|
|
$as_echo "#define PNG_ARM_NEON_OPT 2" >>confdefs.h
|
||
|
|
|
||
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-arm-neon: please specify 'check' or 'api', if
|
||
|
|
diff --git a/Source/LibPNG/pngpriv.h b/Source/LibPNG/pngpriv.h
|
||
|
|
index 81f87616..abf210ad 100644
|
||
|
|
--- a/Source/LibPNG/pngpriv.h
|
||
|
|
+++ b/Source/LibPNG/pngpriv.h
|
||
|
|
@@ -127,7 +127,7 @@
|
||
|
|
* associated assembler code, pass --enable-arm-neon=no to configure
|
||
|
|
* or put -DPNG_ARM_NEON_OPT=0 in CPPFLAGS.
|
||
|
|
*/
|
||
|
|
-# if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
|
||
|
|
+# if defined(PNG_ARM_NEON) && (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
|
||
|
|
defined(PNG_ALIGNED_MEMORY_SUPPORTED)
|
||
|
|
# define PNG_ARM_NEON_OPT 2
|
||
|
|
# else
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|