• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1From 098bb874db85c185e2e3598f735fece7552e6dca Mon Sep 17 00:00:00 2001
2From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
3Date: Mon, 16 May 2022 23:10:26 +0200
4Subject: [PATCH] Fix windows arm builds
5
6---
7 src/lib/openjp2/ht_dec.c | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/src/lib/openjp2/ht_dec.c b/src/lib/openjp2/ht_dec.c
11index 1eb4d525f..e2f3afd6a 100644
12--- a/src/lib/openjp2/ht_dec.c
13+++ b/src/lib/openjp2/ht_dec.c
14@@ -69,7 +69,7 @@ static OPJ_BOOL only_cleanup_pass_is_decoded = OPJ_FALSE;
15 static INLINE
16 OPJ_UINT32 population_count(OPJ_UINT32 val)
17 {
18-#ifdef OPJ_COMPILER_MSVC
19+#if defined(OPJ_COMPILER_MSVC) && (defined(_M_IX86) || defined(_M_AMD64))
20     return (OPJ_UINT32)__popcnt(val);
21 #elif (defined OPJ_COMPILER_GNUC)
22     return (OPJ_UINT32)__builtin_popcount(val);
23