Mirrors/bimg
1
0
Fork 0
mirror of https://github.com/bkaradzic/bimg.git synced 2026-02-17 20:52:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build.

Browse Source
This commit is contained in:
Branimir Karadžić
2023-01-01 19:11:55 -08:00
parent 1af90543ca
commit 6a15b31f19
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/astc-encoder/source/astcenc_vecmathlib_sse_4.h vendored
View File

@@ -1275,7 +1275,11 @@ ASTCENC_SIMD_INLINE vfloat4 dot3(vfloat4 a, vfloat4 b)
*/ */
ASTCENC_SIMD_INLINE int popcount(uint64_t v) ASTCENC_SIMD_INLINE int popcount(uint64_t v)
{ {
#if defined(__MINGW32__)
return static_cast<int>(__builtin_popcountll(v));
#else
return static_cast<int>(_mm_popcnt_u64(v)); return static_cast<int>(_mm_popcnt_u64(v));
#endif // defined(__MINGW32__)
} }
#endif // ASTCENC_POPCNT >= 1 #endif // ASTCENC_POPCNT >= 1

2
src/image.cpp
View File

@@ -5805,7 +5805,7 @@ namespace bimg
return total; return total;
} }
for (uint8_t side = 0, numSides = _imageContainer.m_numLayers * (_imageContainer.m_cubeMap ? 6 : 1); side < numSides && _err->isOk(); ++side) for (uint8_t side = 0, numSides = uint8_t(_imageContainer.m_numLayers * (_imageContainer.m_cubeMap ? 6 : 1) ); side < numSides && _err->isOk(); ++side)
{ {
for (uint8_t lod = 0, num = _imageContainer.m_numMips; lod < num && _err->isOk(); ++lod) for (uint8_t lod = 0, num = _imageContainer.m_numMips; lod < num && _err->isOk(); ++lod)
{ {