| 1 |
diff -up BlockOutII-2.3/contrib/ImageLib/src/jpg/jpegdecoder.cpp~ BlockOutII-2.3/contrib/ImageLib/src/jpg/jpegdecoder.cpp
|
| 2 |
--- BlockOutII-2.3/contrib/ImageLib/src/jpg/jpegdecoder.cpp~ 2007-11-25 22:43:11.000000000 +0100
|
| 3 |
+++ BlockOutII-2.3/contrib/ImageLib/src/jpg/jpegdecoder.cpp 2007-11-25 22:43:11.000000000 +0100
|
| 4 |
@@ -106,7 +106,7 @@ void *jpeg_decoder::alloc(int n)
|
| 5 |
blocks[i] = q;
|
| 6 |
|
| 7 |
// Round to qword boundry, to avoid misaligned accesses with MMX code
|
| 8 |
- return ((void *)(((uint)q + 7) & ~7));
|
| 9 |
+ return ((void *)(((unsigned long)q + 7) & ~7));
|
| 10 |
}
|
| 11 |
//------------------------------------------------------------------------------
|
| 12 |
// Clear buffer to word values.
|
| 13 |
@@ -1884,7 +1884,7 @@ void jpeg_decoder::init_frame(void)
|
| 14 |
q = (uchar *)alloc(max_blocks_per_row * 64 * sizeof(BLOCK_TYPE) + 8);
|
| 15 |
|
| 16 |
// Align to 8-byte boundry, for MMX code
|
| 17 |
- q = (uchar *)(((uint)q + 7) & ~7);
|
| 18 |
+ q = (uchar *)(((unsigned long)q + 7) & ~7);
|
| 19 |
|
| 20 |
// The block_seg[] array's name dates back to the
|
| 21 |
// 16-bit assembler implementation. "seg" stood for "segment".
|
| 22 |
@@ -1894,7 +1894,7 @@ void jpeg_decoder::init_frame(void)
|
| 23 |
for (i = 0; i < max_blocks_per_row; i++)
|
| 24 |
block_max_zag_set[i] = 64;
|
| 25 |
|
| 26 |
- Psample_buf = (uchar *)(((uint)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7);
|
| 27 |
+ Psample_buf = (uchar *)(((unsigned long)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7);
|
| 28 |
|
| 29 |
total_lines_left = image_y_size;
|
| 30 |
|
Parent Directory
| 
Revision Log