Commit a0f078d9 authored by Davis King's avatar Davis King

Minor changes to avoid errors and warnings in visual studio.

parent 9c8188ee
...@@ -297,7 +297,7 @@ dump_buffer (working_state * state) ...@@ -297,7 +297,7 @@ dump_buffer (working_state * state)
* between calls, so 24 bits are sufficient. * between calls, so 24 bits are sufficient.
*/ */
INLINE inline
LOCAL(int) LOCAL(int)
emit_bits (working_state * state, unsigned int code, int size) emit_bits (working_state * state, unsigned int code, int size)
/* Emit some bits; return TRUE if successful, FALSE if must suspend */ /* Emit some bits; return TRUE if successful, FALSE if must suspend */
...@@ -827,7 +827,7 @@ jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]) ...@@ -827,7 +827,7 @@ jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[])
for (i = 1; i <= MAX_CLEN; i++) { for (i = 1; i <= MAX_CLEN; i++) {
for (j = 0; j <= 255; j++) { for (j = 0; j <= 255; j++) {
if (codesize[j] == i) { if (codesize[j] == i) {
htbl->huffval[p] = (unsigned short) j; htbl->huffval[p] = (unsigned char) j;
p++; p++;
} }
} }
......
...@@ -223,7 +223,7 @@ dump_buffer (phuff_entropy_ptr entropy) ...@@ -223,7 +223,7 @@ dump_buffer (phuff_entropy_ptr entropy)
* between calls, so 24 bits are sufficient. * between calls, so 24 bits are sufficient.
*/ */
INLINE inline
LOCAL(void) LOCAL(void)
emit_bits (phuff_entropy_ptr entropy, unsigned int code, int size) emit_bits (phuff_entropy_ptr entropy, unsigned int code, int size)
/* Emit some bits, unless we are in gather mode */ /* Emit some bits, unless we are in gather mode */
...@@ -276,7 +276,7 @@ flush_bits (phuff_entropy_ptr entropy) ...@@ -276,7 +276,7 @@ flush_bits (phuff_entropy_ptr entropy)
* Emit (or just count) a Huffman symbol. * Emit (or just count) a Huffman symbol.
*/ */
INLINE inline
LOCAL(void) LOCAL(void)
emit_symbol (phuff_entropy_ptr entropy, int tbl_no, int symbol) emit_symbol (phuff_entropy_ptr entropy, int tbl_no, int symbol)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment