[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.361,2.362 gfx.h,1.90,1.91
Max Horn
fingolfin at users.sourceforge.net
Mon Oct 4 07:43:43 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4870
Modified Files:
gfx.cpp gfx.h
Log Message:
Remove Gdi::fillRect, use the existing fill() method instead
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.361
retrieving revision 2.362
diff -u -d -r2.361 -r2.362
--- gfx.cpp 4 Oct 2004 14:02:37 -0000 2.361
+++ gfx.cpp 4 Oct 2004 14:39:42 -0000 2.362
@@ -39,6 +39,7 @@
static void copy8Col(byte *dst, int dstPitch, const byte *src, int height);
static void clear8Col(byte *dst, int dstPitch, int height);
+
struct StripTable {
int offsets[160];
int run[160];
@@ -1394,7 +1395,7 @@
// for an area spanning multiple strips. In particular, the codecs 13 & 14
// in decompressBitmap call drawStripHE()
if (code == 150) {
- fillRect((byte *)vs->backBuf, vs->pitch, 0, 0, vs->w - 1, vs->h - 1, *bmap_ptr);
+ fill((byte *)vs->backBuf, vs->pitch, *bmap_ptr, vs->w, vs->h);
} else if ((code >= 134 && code <= 138) || (code >= 144 && code <= 148)) {
_decomp_shr = code % 10;
_decomp_mask = 0xFF >> (8 - _decomp_shr);
@@ -2169,20 +2170,6 @@
}
}
-void Gdi::fillRect(byte *dst, int pitch, int x1, int y1, int x2, int y2, byte color) {
- int w, h;
- byte *ptr = dst + x1 + y1 * pitch;
-
- w = x2 - x1 + 1;
- h = y2 - y1 + 1;
-
- for (int i = 0; i < h; i++) {
- memset(ptr, color, w);
- ptr += pitch;
- }
-}
-
-
#undef READ_BIT
#undef FILL_BITS
Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- gfx.h 4 Oct 2004 13:49:30 -0000 1.90
+++ gfx.h 4 Oct 2004 14:39:42 -0000 1.91
@@ -249,7 +249,6 @@
void drawStrip3DO(byte *dst, int dstPitch, const byte *src, int height, const bool transpCheck) const;
void drawStripHE(byte *dst, int dstPitch, const byte *src, int width, int height, const bool transpCheck) const;
- void fillRect(byte *dst, int dstPitch, int x1, int y1, int x2, int y2, byte color);
/* Mask decompressors */
void drawStripC64Mask(byte *dst, int stripnr, int width, int height) const;
More information about the Scummvm-git-logs
mailing list