More explicit casts

Author: flanglet

src/entropy/EntropyUtils.cpp

@@ -47,7 +47,7 @@ struct FreqDataComparator {
     {
         // Decreasing frequency then decreasing symbol
         int r;
-        return  ((r = *fd1._freq - *fd2._freq) == 0) ? fd1._symbol > fd2._symbol: r > 0;
+        return ((r = int(*fd1._freq - *fd2._freq)) == 0) ? fd1._symbol > fd2._symbol: r > 0;
     }
 };
 
@@ -233,7 +233,7 @@ int EntropyUtils::normalizeFrequencies(uint freqs[], uint alphabet[], int length
        if (freqs[alphabet[i]] <= 2) // Do not distort small frequencies
           continue;
 
-       queue.push_back(FreqSortData(&freqs[alphabet[i]], alphabet[i]));
+       queue.push_back(FreqSortData(&freqs[alphabet[i]], uint8(alphabet[i])));
     }
 
     const int inc = (delta > 0) ? -1 : 1;

src/transform/SBRT.cpp

@@ -78,12 +78,12 @@ bool SBRT::forward(SliceArray<byte>& input, SliceArray<byte>& output, int count)
         // Move up symbol to correct rank
         while ((r > 0) && (q[r2s[r - 1]] <= qc)) {
             r2s[r] = r2s[r - 1];
-            s2r[r2s[r]] = r;
+            s2r[r2s[r]] = uint8(r);
             r--;
         }
 
         r2s[r] = c;
-        s2r[c] = r;
+        s2r[c] = uint8(r);
     }
 
     input._index += count;