Fix for LP64 architectures; Add some more tests.

[bertos.git] / mware / text_format.c

diff --git a/mware/text_format.c b/mware/text_format.c
index 6bf3945f7fe08e670e873673a459c098c02f3680..8ae71b668fb8497309330d8dd143e1c76f308ba1 100755 (executable)
--- a/mware/text_format.c
+++ b/mware/text_format.c
@@ -3,7 +3,7 @@
  * <!--
  * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief printf-family routines for text output
@@ -15,6 +15,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.10  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* 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.
  *#*
@@ -147,7 +156,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 +166,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 */
@@ -171,7 +180,10 @@ int PGM_FUNC(text_xprintf)(struct Bitmap *bm,
 /*!
  * 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;
 }