aboutsummaryrefslogtreecommitdiff
path: root/trees.c
diff options
context:
space:
mode:
Diffstat (limited to 'trees.c')
-rw-r--r--trees.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/trees.c b/trees.c
index 94f28bb..aa599a5 100644
--- a/trees.c
+++ b/trees.c
@@ -1,5 +1,5 @@
1/* trees.c -- output deflated data using Huffman coding 1/* trees.c -- output deflated data using Huffman coding
2 * Copyright (C) 1995-2006 Jean-loup Gailly 2 * Copyright (C) 1995-2009 Jean-loup Gailly
3 * detect_data_type() function provided freely by Cosmin Truta, 2006 3 * detect_data_type() function provided freely by Cosmin Truta, 2006
4 * For conditions of distribution and use, see copyright notice in zlib.h 4 * For conditions of distribution and use, see copyright notice in zlib.h
5 */ 5 */
@@ -204,12 +204,12 @@ local void send_bits(s, value, length)
204 * unused bits in value. 204 * unused bits in value.
205 */ 205 */
206 if (s->bi_valid > (int)Buf_size - length) { 206 if (s->bi_valid > (int)Buf_size - length) {
207 s->bi_buf |= (value << s->bi_valid); 207 s->bi_buf |= (ush)value << s->bi_valid;
208 put_short(s, s->bi_buf); 208 put_short(s, s->bi_buf);
209 s->bi_buf = (ush)value >> (Buf_size - s->bi_valid); 209 s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
210 s->bi_valid += length - Buf_size; 210 s->bi_valid += length - Buf_size;
211 } else { 211 } else {
212 s->bi_buf |= value << s->bi_valid; 212 s->bi_buf |= (ush)value << s->bi_valid;
213 s->bi_valid += length; 213 s->bi_valid += length;
214 } 214 }
215} 215}
@@ -219,12 +219,12 @@ local void send_bits(s, value, length)
219{ int len = length;\ 219{ int len = length;\
220 if (s->bi_valid > (int)Buf_size - len) {\ 220 if (s->bi_valid > (int)Buf_size - len) {\
221 int val = value;\ 221 int val = value;\
222 s->bi_buf |= (val << s->bi_valid);\ 222 s->bi_buf |= (ush)val << s->bi_valid;\
223 put_short(s, s->bi_buf);\ 223 put_short(s, s->bi_buf);\
224 s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\ 224 s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
225 s->bi_valid += len - Buf_size;\ 225 s->bi_valid += len - Buf_size;\
226 } else {\ 226 } else {\
227 s->bi_buf |= (value) << s->bi_valid;\ 227 s->bi_buf |= (ush)(value) << s->bi_valid;\
228 s->bi_valid += len;\ 228 s->bi_valid += len;\
229 }\ 229 }\
230} 230}