xnu-7195.50.7.100.1.tar.gz

[apple/xnu.git] / libkern / zlib / trees.c

diff --git a/libkern/zlib/trees.c b/libkern/zlib/trees.c
index 21d483a7f769ccdd77b57b4e74df38b0069b7255..2e4b337cf1237464d4a9af2c86f34eac9395ecde 100644 (file)
--- a/libkern/zlib/trees.c
+++ b/libkern/zlib/trees.c
@@ -625,7 +625,7 @@ gen_codes(ct_data *tree, int max_code, ushf *bl_count)
      * without bit reversal.
      */
     for (bits = 1; bits <= MAX_BITS; bits++) {
      * without bit reversal.
      */
     for (bits = 1; bits <= MAX_BITS; bits++) {

-        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
+        next_code[bits] = code = (ush)((code + bl_count[bits-1]) << 1);

     }
     /* Check that the bit counts in bl_count are consistent. The last code
      * must be all ones.
     }
     /* Check that the bit counts in bl_count are consistent. The last code
      * must be all ones.


@@ -638,7 +638,7 @@ gen_codes(ct_data *tree, int max_code, ushf *bl_count)
         int len = tree[n].Len;
         if (len == 0) continue;
         /* Now reverse the bits */
         int len = tree[n].Len;
         if (len == 0) continue;
         /* Now reverse the bits */

-        tree[n].Code = bi_reverse(next_code[len]++, len);
+        tree[n].Code = (ush)bi_reverse(next_code[len]++, len);

 
         Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
              n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
 
         Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
              n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));