7e3b83b146
* VS2022 is required. * Only OpenPGL and DPCPP are disabled, other libraries are supported. * Embree is built with LLVM and VS2019 tools, and for that reason has its own cmake file as it is quite different. * TBB and USD patches should become obsolete once these are upstreamed and Blender upgrades to the latest versions. Ref #119126 Pull Request: https://projects.blender.org/blender/blender/pulls/117036
14 lines
522 B
Diff
14 lines
522 B
Diff
diff --git a/src/lib/openjp2/ht_dec.c b/src/lib/openjp2/ht_dec.c
|
|
index 1eb4d525..e2f3afd6 100644
|
|
--- a/src/lib/openjp2/ht_dec.c
|
|
+++ b/src/lib/openjp2/ht_dec.c
|
|
@@ -69,7 +69,7 @@ static OPJ_BOOL only_cleanup_pass_is_decoded = OPJ_FALSE;
|
|
static INLINE
|
|
OPJ_UINT32 population_count(OPJ_UINT32 val)
|
|
{
|
|
-#ifdef OPJ_COMPILER_MSVC
|
|
+#if defined(OPJ_COMPILER_MSVC) && (defined(_M_IX86) || defined(_M_AMD64))
|
|
return (OPJ_UINT32)__popcnt(val);
|
|
#elif (defined OPJ_COMPILER_GNUC)
|
|
return (OPJ_UINT32)__builtin_popcount(val);
|