|
|
753c03c |
diff -ur ClanLib-0.6.5.orig/Sources/SmallJPEG/jpgd/jpegdecoder.cpp ClanLib-0.6.5/Sources/SmallJPEG/jpgd/jpegdecoder.cpp
|
|
|
753c03c |
--- ClanLib-0.6.5.orig/Sources/SmallJPEG/jpgd/jpegdecoder.cpp 2001-04-25 18:14:41.000000000 +0200
|
|
|
753c03c |
+++ ClanLib-0.6.5/Sources/SmallJPEG/jpgd/jpegdecoder.cpp 2006-07-20 12:25:34.000000000 +0200
|
|
|
753c03c |
@@ -102,7 +102,7 @@
|
|
|
753c03c |
blocks[i] = q;
|
|
|
753c03c |
|
|
|
753c03c |
// Round to qword boundry, to avoid misaligned accesses with MMX code
|
|
|
753c03c |
- return ((void *)(((uint)q + 7) & ~7));
|
|
|
753c03c |
+ return ((void *)(((unsigned long)q + 7) & ~7));
|
|
|
753c03c |
}
|
|
|
753c03c |
//------------------------------------------------------------------------------
|
|
|
753c03c |
// Clear buffer to word values.
|
|
|
753c03c |
@@ -1870,7 +1870,7 @@
|
|
|
753c03c |
q = (uchar *)alloc(max_blocks_per_row * 64 * sizeof(BLOCK_TYPE) + 8);
|
|
|
753c03c |
|
|
|
753c03c |
// Align to 8-byte boundry, for MMX code
|
|
|
753c03c |
- q = (uchar *)(((uint)q + 7) & ~7);
|
|
|
753c03c |
+ q = (uchar *)(((unsigned long)q + 7) & ~7);
|
|
|
753c03c |
|
|
|
753c03c |
// The block_seg[] array's name dates back to the
|
|
|
753c03c |
// 16-bit assembler implementation. "seg" stood for "segment".
|
|
|
753c03c |
@@ -1880,7 +1880,7 @@
|
|
|
753c03c |
for (i = 0; i < max_blocks_per_row; i++)
|
|
|
753c03c |
block_max_zag_set[i] = 64;
|
|
|
753c03c |
|
|
|
753c03c |
- Psample_buf = (uchar *)(((uint)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7);
|
|
|
753c03c |
+ Psample_buf = (uchar *)(((unsigned long)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7);
|
|
|
753c03c |
|
|
|
753c03c |
total_lines_left = image_y_size;
|
|
|
753c03c |
|
|
|
753c03c |
diff -ur ClanLib-0.6.5.orig/Sources/SmallJPEG/jpgd/jpegdecoder.h ClanLib-0.6.5/Sources/SmallJPEG/jpgd/jpegdecoder.h
|
|
|
753c03c |
--- ClanLib-0.6.5.orig/Sources/SmallJPEG/jpgd/jpegdecoder.h 2001-05-07 10:36:59.000000000 +0200
|
|
|
753c03c |
+++ ClanLib-0.6.5/Sources/SmallJPEG/jpgd/jpegdecoder.h 2006-07-20 12:24:08.000000000 +0200
|
|
|
753c03c |
@@ -493,26 +493,26 @@
|
|
|
753c03c |
|
|
|
753c03c |
void find_eoi(void);
|
|
|
753c03c |
//------------------
|
|
|
753c03c |
- /*inline*/ uint jpeg_decoder::rol(uint i, uchar j);
|
|
|
753c03c |
- /*inline*/ uint jpeg_decoder::get_char(void);
|
|
|
753c03c |
- /*inline*/ uint jpeg_decoder::get_char(bool *Ppadding_flag);
|
|
|
753c03c |
- /*inline*/ void jpeg_decoder::stuff_char(uchar q);
|
|
|
753c03c |
- /*inline*/ uchar jpeg_decoder::get_octet(void);
|
|
|
753c03c |
- /*inline*/ uint jpeg_decoder::get_bits_1(int num_bits);
|
|
|
753c03c |
- /*inline*/ uint jpeg_decoder::get_bits_2(int numbits);
|
|
|
753c03c |
- /*inline*/ int jpeg_decoder::huff_decode(Phuff_tables_t Ph);
|
|
|
753c03c |
+ /*inline*/ uint rol(uint i, uchar j);
|
|
|
753c03c |
+ /*inline*/ uint get_char(void);
|
|
|
753c03c |
+ /*inline*/ uint get_char(bool *Ppadding_flag);
|
|
|
753c03c |
+ /*inline*/ void stuff_char(uchar q);
|
|
|
753c03c |
+ /*inline*/ uchar get_octet(void);
|
|
|
753c03c |
+ /*inline*/ uint get_bits_1(int num_bits);
|
|
|
753c03c |
+ /*inline*/ uint get_bits_2(int numbits);
|
|
|
753c03c |
+ /*inline*/ int huff_decode(Phuff_tables_t Ph);
|
|
|
753c03c |
#ifdef SUPPORT_X86ASM
|
|
|
753c03c |
- /*inline*/ uint jpeg_decoder::huff_extend(uint i, int c);
|
|
|
753c03c |
+ /*inline*/ uint huff_extend(uint i, int c);
|
|
|
753c03c |
#endif
|
|
|
753c03c |
- /*inline*/ uchar jpeg_decoder::clamp(int i);
|
|
|
753c03c |
+ /*inline*/ uchar clamp(int i);
|
|
|
753c03c |
|
|
|
753c03c |
#ifdef SUPPORT_MMX
|
|
|
753c03c |
- /*inline*/ uint jpeg_decoder::get_high_byte_mmx(void);
|
|
|
753c03c |
- /*inline*/ uint jpeg_decoder::get_high_word_mmx(void);
|
|
|
753c03c |
- /*inline*/ void jpeg_decoder::get_bits_2_mmx_init(void);
|
|
|
753c03c |
- /*inline*/ void jpeg_decoder::get_bits_2_mmx_deinit(void);
|
|
|
753c03c |
- /*inline*/ uint jpeg_decoder::get_bits_2_mmx(int numbits);
|
|
|
753c03c |
- /*inline*/ int jpeg_decoder::huff_decode_mmx(Phuff_tables_t Ph);
|
|
|
753c03c |
+ /*inline*/ uint get_high_byte_mmx(void);
|
|
|
753c03c |
+ /*inline*/ uint get_high_word_mmx(void);
|
|
|
753c03c |
+ /*inline*/ void get_bits_2_mmx_init(void);
|
|
|
753c03c |
+ /*inline*/ void get_bits_2_mmx_deinit(void);
|
|
|
753c03c |
+ /*inline*/ uint get_bits_2_mmx(int numbits);
|
|
|
753c03c |
+ /*inline*/ int huff_decode_mmx(Phuff_tables_t Ph);
|
|
|
753c03c |
#endif
|
|
|
753c03c |
//------------------
|
|
|
753c03c |
int image_x_size;
|