Scarfski/basis_universal
1
0
Fork 0
mirror of https://github.com/BinomialLLC/basis_universal.git synced 2026-06-08 00:23:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor Clang fixes

Browse Source 
Minor fixes so that Clang doesn't trip with `-Werror` and `-Wextra`.
This commit is contained in:
Carl Woffenden
2019-09-20 06:42:13 -04:00
parent dad34eac9e
commit a6bd48a16c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
transcoder/basisu.h
View File

@@ -142,7 +142,7 @@ namespace basisu
inline bool is_pow2(uint32_t x) { return x && ((x & (x - 1U)) == 0U); }
inline bool is_pow2(uint64_t x) { return x && ((x & (x - 1U)) == 0U); }
template<typename T> inline T open_range_check(T v, T minv, T maxv) { assert(v >= minv && v < maxv); return v; }
template<typename T> inline T open_range_check(T v, T minv, T maxv) { assert(v >= minv && v < maxv); BASISU_NOTE_UNUSED(minv); BASISU_NOTE_UNUSED(maxv); return v; }
template<typename T> inline T open_range_check(T v, T maxv) { assert(v < maxv); BASISU_NOTE_UNUSED(maxv); return v; }
inline uint32_t total_bits(uint32_t v) { uint32_t l = 0; for ( ; v > 0U; ++l) v >>= 1; return l; }

2
transcoder/basisu_transcoder.cpp
View File

@@ -3411,6 +3411,7 @@ namespace basist
const uint32_t min_bits = basisu::minimum(x_bits, y_bits);
const uint32_t max_bits = basisu::maximum(x_bits, y_bits);
const uint32_t swizzle_mask = (1 << (min_bits * 2)) - 1;
BASISU_NOTE_UNUSED(max_bits);
uint32_t block_index = 0;
@@ -3594,6 +3595,7 @@ namespace basist
const uint32_t min_bits = basisu::minimum(x_bits, y_bits);
const uint32_t max_bits = basisu::maximum(x_bits, y_bits);
const uint32_t swizzle_mask = (1 << (min_bits * 2)) - 1;
BASISU_NOTE_UNUSED(max_bits);
uint32_t block_index = 0;