From: bernie Date: Tue, 16 Nov 2004 21:16:56 +0000 (+0000) Subject: Update to new naming scheme in mware/gfx.c. X-Git-Tag: 1.0.0~965 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=1a3aed4dd1bf9448fd36e95f47280ffc042dd570;p=bertos.git Update to new naming scheme in mware/gfx.c. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@276 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/mware/text.c b/mware/text.c index d7d0d3b5..fd8868fd 100755 --- a/mware/text.c +++ b/mware/text.c @@ -15,6 +15,9 @@ /*#* *#* $Log$ + *#* Revision 1.8 2004/11/16 21:16:28 bernie + *#* Update to new naming scheme in mware/gfx.c. + *#* *#* Revision 1.7 2004/09/20 03:28:28 bernie *#* Fix header. *#* @@ -201,7 +204,7 @@ int text_putchar(char c, struct Bitmap *bm) switch (c) { case ANSI_ESC_CLEARSCREEN: - gfx_ClearBitmap(bm); + gfx_bitmapClear(bm); bm->penX = 0; bm->penY = 0; text_style(0, STYLEF_MASK); @@ -243,7 +246,7 @@ void text_clear(struct Bitmap *bmp) void text_clearLine(struct Bitmap *bmp, int line) { - gfx_ClearRect(bmp, 0, line * FONT_HEIGHT, bmp->width, (line + 1) * FONT_HEIGHT); + gfx_rectClear(bmp, 0, line * FONT_HEIGHT, bmp->width, (line + 1) * FONT_HEIGHT); } diff --git a/mware/text_format.c b/mware/text_format.c index 6bf3945f..c38bff8c 100755 --- a/mware/text_format.c +++ b/mware/text_format.c @@ -15,6 +15,9 @@ /*#* *#* $Log$ + *#* Revision 1.8 2004/11/16 21:16:56 bernie + *#* Update to new naming scheme in mware/gfx.c. + *#* *#* Revision 1.7 2004/10/03 19:05:04 bernie *#* text_widthf(), text_vwidthf(): New functions. *#* @@ -147,7 +150,7 @@ int PGM_FUNC(text_xprintf)(struct Bitmap *bm, pad /= 2; if (style & TEXT_FILL) - gfx_RectFillC(bm, 0, row * FONT_HEIGHT, pad, (row + 1) * FONT_HEIGHT, + gfx_rectFillC(bm, 0, row * FONT_HEIGHT, pad, (row + 1) * FONT_HEIGHT, (style & STYLEF_INVERT) ? 0xFF : 0x00); text_setcoord(bm, pad, row * FONT_HEIGHT); @@ -157,7 +160,7 @@ int PGM_FUNC(text_xprintf)(struct Bitmap *bm, va_end(ap); if (style & TEXT_FILL) - gfx_RectFillC(bm, bm->penX, row * FONT_HEIGHT, bm->width, (row + 1) * FONT_HEIGHT, + gfx_rectFillC(bm, bm->penX, row * FONT_HEIGHT, bm->width, (row + 1) * FONT_HEIGHT, (style & STYLEF_INVERT) ? 0xFF : 0x00); /* Restore old style */