Move declaration of gr_rle_expand_scanline_generic() to rle.h - patch by Kp
This commit is contained in:
parent
dad55f1072
commit
f3cad7ce27
|
@ -530,9 +530,6 @@ void gr_bm_ubitblt00m_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitm
|
|||
|
||||
// in rle.c
|
||||
|
||||
extern void gr_rle_expand_scanline_generic( grs_bitmap * dest, int dx, int dy, ubyte *src,
|
||||
int x1, int x2, int masked );
|
||||
|
||||
|
||||
void gr_bm_ubitblt0x_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitmap * src,
|
||||
grs_bitmap * dest, int masked )
|
||||
|
@ -550,8 +547,7 @@ void gr_bm_ubitblt0x_rle(int w, int h, int dx, int dy, int sx, int sy, grs_bitma
|
|||
sbits += (int)(INTEL_SHORT(src->bm_data[4+(i*data_offset)]));
|
||||
|
||||
for (y1=0; y1 < h; y1++ ) {
|
||||
gr_rle_expand_scanline_generic( dest, dx, dy+y1, sbits, sx, sx+w-1,
|
||||
masked );
|
||||
gr_rle_expand_scanline_generic( dest, dx, dy+y1, sbits, sx, sx+w-1);
|
||||
if ( src->bm_flags & BM_FLAG_RLE_BIG )
|
||||
sbits += (int)INTEL_SHORT(*((short *)&(src->bm_data[4+((y1+sy)*data_offset)])));
|
||||
else
|
||||
|
|
|
@ -12,6 +12,7 @@ include/console.h, main/console.c: Marked con_printf fmt as const, Increased con
|
|||
2d/font.c: Fixed test for font magic number; Consolidated grs_font_read() - patches by Kp
|
||||
main/menu.c, main/multi.h, main/net_udp.c: Moved vers_id.h inclusion to where it is needed - patch by Kp
|
||||
2d/bitmap.c: Include bitmap.h - patch by Kp
|
||||
2d/bitblt.c, include/rle.h: Move declaration of gr_rle_expand_scanline_generic() to rle.h - patch by Kp
|
||||
|
||||
20121031
|
||||
--------
|
||||
|
|
|
@ -34,5 +34,6 @@ void rle_cache_close();
|
|||
void rle_cache_flush();
|
||||
void rle_swap_0_255(grs_bitmap *bmp);
|
||||
void rle_remap(grs_bitmap *bmp, ubyte *colormap);
|
||||
void gr_rle_expand_scanline_generic( grs_bitmap * dest, int dx, int dy, ubyte *src, int x1, int x2 );
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue