kram - fix bug in length() call, and warnings in lodepng

alecazam · May 13, 2021 · f0f81cb · f0f81cb
1 parent 4be8f27
commit f0f81cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libkram/kram/float4a.h b/libkram/kram/float4a.h
@@ -368,7 +368,7 @@ inline float length_squared(const float4& vv)
 }
 inline float length(const float4& vv)
 {
-    return sqrtf(length(vv));
+    return sqrtf(length_squared(vv));
 }
 
 // sse4.1 ops

diff --git a/libkram/lodepng/lodepng.cpp b/libkram/lodepng/lodepng.cpp
@@ -715,7 +715,7 @@ static unsigned HuffmanTree_makeTable(HuffmanTree* tree) {
   size = headsize;
   for(i = 0; i < headsize; ++i) {
     unsigned l = maxlens[i];
-    if(l > FIRSTBITS) size += (1u << (l - FIRSTBITS));
+    if(l > FIRSTBITS) size += (unsigned)(1u << (l - FIRSTBITS));
   }
   tree->table_len = (unsigned char*)lodepng_malloc(size * sizeof(*tree->table_len));
   tree->table_value = (unsigned short*)lodepng_malloc(size * sizeof(*tree->table_value));
@@ -734,7 +734,7 @@ static unsigned HuffmanTree_makeTable(HuffmanTree* tree) {
     if(l <= FIRSTBITS) continue;
     tree->table_len[i] = l;
     tree->table_value[i] = pointer;
-    pointer += (1u << (l - FIRSTBITS));
+    pointer += (unsigned)(1u << (l - FIRSTBITS));
   }
   lodepng_free(maxlens);
 
@@ -5447,7 +5447,7 @@ static size_t ilog2i(size_t i) {
   l = ilog2(i);
   /* approximate i*log2(i): l is integer logarithm, ((i - (1u << l)) << 1u)
   linearly approximates the missing fractional part multiplied by i */
-  return i * l + ((i - (1u << l)) << 1u);
+  return i * l + ((i - ((size_t)1 << l)) << (size_t)1);
 }
 
 static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h,