TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move declaration of gr_rle_expand_scanline_generic() to rle.h - patch by Kp

Browse source
This commit is contained in:
zicodxx 2012-11-02 18:41:43 +01:00
parent dad55f1072
commit f3cad7ce27
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
2d/bitblt.c
View file

@ -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

1
CHANGELOG.txt
View file

@ -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
--------

1
include/rle.h
View file

@ -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