projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing include
[bertos.git]
/
mware
/
text_format.c
diff --git
a/mware/text_format.c
b/mware/text_format.c
index 6bf3945f7fe08e670e873673a459c098c02f3680..d8080a90c53d3c46727bd0f37f0f0902c2aa0d4f 100755
(executable)
--- a/
mware/text_format.c
+++ b/
mware/text_format.c
@@
-15,6
+15,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.9 2004/12/31 17:47:45 bernie
+ *#* Rename UNUSED() to UNUSED_ARG().
+ *#*
+ *#* 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.
*#*
*#* Revision 1.7 2004/10/03 19:05:04 bernie
*#* text_widthf(), text_vwidthf(): New functions.
*#*
@@
-147,7
+153,7
@@
int PGM_FUNC(text_xprintf)(struct Bitmap *bm,
pad /= 2;
if (style & TEXT_FILL)
pad /= 2;
if (style & TEXT_FILL)
- gfx_
R
ectFillC(bm, 0, row * FONT_HEIGHT, pad, (row + 1) * FONT_HEIGHT,
+ gfx_
r
ectFillC(bm, 0, row * FONT_HEIGHT, pad, (row + 1) * FONT_HEIGHT,
(style & STYLEF_INVERT) ? 0xFF : 0x00);
text_setcoord(bm, pad, row * FONT_HEIGHT);
(style & STYLEF_INVERT) ? 0xFF : 0x00);
text_setcoord(bm, pad, row * FONT_HEIGHT);
@@
-157,7
+163,7
@@
int PGM_FUNC(text_xprintf)(struct Bitmap *bm,
va_end(ap);
if (style & TEXT_FILL)
va_end(ap);
if (style & TEXT_FILL)
- gfx_
R
ectFillC(bm, bm->penX, row * FONT_HEIGHT, bm->width, (row + 1) * FONT_HEIGHT,
+ gfx_
r
ectFillC(bm, bm->penX, row * FONT_HEIGHT, bm->width, (row + 1) * FONT_HEIGHT,
(style & STYLEF_INVERT) ? 0xFF : 0x00);
/* Restore old style */
(style & STYLEF_INVERT) ? 0xFF : 0x00);
/* Restore old style */
@@
-171,7
+177,10
@@
int PGM_FUNC(text_xprintf)(struct Bitmap *bm,
/*!
* Return the width in pixels of a vprintf()-formatted string.
*/
/*!
* Return the width in pixels of a vprintf()-formatted string.
*/
-int PGM_FUNC(text_vwidthf)(UNUSED(struct Bitmap *, bm), const char * PGM_ATTR fmt, va_list ap)
+int PGM_FUNC(text_vwidthf)(
+ UNUSED_ARG(struct Bitmap *, bm),
+ const char * PGM_ATTR fmt,
+ va_list ap)
{
return PGM_FUNC(vsprintf)(NULL, fmt, ap) * FONT_WIDTH;
}
{
return PGM_FUNC(vsprintf)(NULL, fmt, ap) * FONT_WIDTH;
}