Xcode 11 transcoder warnings removed
With the default Xcode 11 settings, these non-functional changes remove warnings when building for iOS and Mac, notably:
Possible misuse of comma operator here
Implicit conversion loses integer precision: 'long' to 'int'
diff --git a/transcoder/basisu_transcoder.cpp b/transcoder/basisu_transcoder.cpp
index 1d6a46e..b6d29b8 100644
--- a/transcoder/basisu_transcoder.cpp
+++ b/transcoder/basisu_transcoder.cpp
@@ -7387,7 +7387,7 @@
uint32_t m = (le * 5 + he * 3) / 8;
- int err = labs((int)v - (int)m);
+ int err = (int)labs((int)v - (int)m);
if (err < lowest_err)
{
lowest_err = err;
@@ -7410,7 +7410,7 @@
uint32_t le = (l << 1);
le = (le << 4) | le;
- int err = labs((int)v - (int)le);
+ int err = (int)labs((int)v - (int)le);
if (err < lowest_err)
{
lowest_err = err;
@@ -7432,7 +7432,7 @@
uint32_t he = (h << 1) | 1;
he = (he << 4) | he;
- int err = labs((int)v - (int)he);
+ int err = (int)labs((int)v - (int)he);
if (err < lowest_err)
{
lowest_err = err;
@@ -7461,7 +7461,7 @@
uint32_t m = (le * 5 + he * 3) / 8;
- int err = labs((int)v - (int)m);
+ int err = (int)labs((int)v - (int)m);
if (err < lowest_err)
{
lowest_err = err;
@@ -7491,7 +7491,7 @@
uint32_t m = (le * 5 + he * 3) / 8;
- int err = labs((int)v - (int)m);
+ int err = (int)labs((int)v - (int)m);
if (err < lowest_err)
{
lowest_err = err;
@@ -14682,7 +14682,9 @@
total_r += r; total_g += g; total_b += b;
}
- avg_r = (total_r + 8) >> 4, avg_g = (total_g + 8) >> 4, avg_b = (total_b + 8) >> 4;
+ avg_r = (total_r + 8) >> 4;
+ avg_g = (total_g + 8) >> 4;
+ avg_b = (total_b + 8) >> 4;
int icov[6] = { 0, 0, 0, 0, 0, 0 };
for (uint32_t i = 0; i < 16; i++)
@@ -14778,7 +14780,9 @@
total_b += pSrc_pixels[i].b;
}
- avg_r = (total_r + 8) >> 4, avg_g = (total_g + 8) >> 4, avg_b = (total_b + 8) >> 4;
+ avg_r = (total_r + 8) >> 4;
+ avg_g = (total_g + 8) >> 4;
+ avg_b = (total_b + 8) >> 4;
}
// All selectors equal - treat it as a solid block which should always be equal or better.
@@ -14929,7 +14933,9 @@
}
else
{
- avg_r = (total_r + 8) >> 4, avg_g = (total_g + 8) >> 4, avg_b = (total_b + 8) >> 4;
+ avg_r = (total_r + 8) >> 4;
+ avg_g = (total_g + 8) >> 4;
+ avg_b = (total_b + 8) >> 4;
// Find the shortest vector from a AABB corner to the block's average color.
// This is to help avoid outliers.
@@ -15039,20 +15045,29 @@
}
}
- low_c = low_dot0 & 15, high_c = ~high_dot0 & 15;
+ low_c = low_dot0 & 15;
+ high_c = ~high_dot0 & 15;
uint32_t r = (high_dot0 & ~15) - (low_dot0 & ~15);
uint32_t tr = (high_dot1 & ~15) - (low_dot1 & ~15);
- if (tr > r)
- low_c = low_dot1 & 15, high_c = ~high_dot1 & 15, r = tr;
+ if (tr > r) {
+ low_c = low_dot1 & 15;
+ high_c = ~high_dot1 & 15;
+ r = tr;
+ }
tr = (high_dot2 & ~15) - (low_dot2 & ~15);
- if (tr > r)
- low_c = low_dot2 & 15, high_c = ~high_dot2 & 15, r = tr;
+ if (tr > r) {
+ low_c = low_dot2 & 15;
+ high_c = ~high_dot2 & 15;
+ r = tr;
+ }
tr = (high_dot3 & ~15) - (low_dot3 & ~15);
- if (tr > r)
- low_c = low_dot3 & 15, high_c = ~high_dot3 & 15;
+ if (tr > r) {
+ low_c = low_dot3 & 15;
+ high_c = ~high_dot3 & 15;
+ }
}
lr = to_5(pSrc_pixels[low_c].r);
@@ -15086,7 +15101,9 @@
total_b += pSrc_pixels[i].b;
}
- avg_r = (total_r + 8) >> 4, avg_g = (total_g + 8) >> 4, avg_b = (total_b + 8) >> 4;
+ avg_r = (total_r + 8) >> 4;
+ avg_g = (total_g + 8) >> 4;
+ avg_b = (total_b + 8) >> 4;
}
// All selectors equal - treat it as a solid block which should always be equal or better.
