projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add demo application.
[bertos.git]
/
gfx
/
text.c
diff --git
a/gfx/text.c
b/gfx/text.c
index f8705cc4ed5ddeaba552401cc01896cb03da8643..08d3ae6167283343b7d0b4d4b31a7fc60fce1696 100755
(executable)
--- a/
gfx/text.c
+++ b/
gfx/text.c
@@
-15,6
+15,9
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.8 2006/03/22 09:50:37 bernie
+ *#* Use the same format for fonts and rasters.
+ *#*
*#* Revision 1.7 2006/03/20 17:51:55 bernie
*#* Cleanups.
*#*
*#* Revision 1.7 2006/03/20 17:51:55 bernie
*#* Cleanups.
*#*
@@
-213,7
+216,7
@@
static int text_putglyph(char c, struct Bitmap *bm)
src_col /= 2;
/* Fetch a column of dots from glyph. */
src_col /= 2;
/* Fetch a column of dots from glyph. */
- dots = PGM_READ_CHAR(
glyph + src_col * glyph_height_bytes + row
);
+ dots = PGM_READ_CHAR(
RAST_ADDR(glyph, src_col, row * 8, glyph_width)
);
/* Italic: get lower 4 dots from previous column */
if (styles & STYLEF_ITALIC)
/* Italic: get lower 4 dots from previous column */
if (styles & STYLEF_ITALIC)
@@
-249,7
+252,7
@@
static int text_putglyph(char c, struct Bitmap *bm)
else
{
/* No style: fast vanilla copy of glyph to bitmap */
else
{
/* No style: fast vanilla copy of glyph to bitmap */
- gfx_blitRaster(bm, bm->penX, bm->penY, glyph, glyph_width, glyph_height, glyph_
height_bytes
);
+ gfx_blitRaster(bm, bm->penX, bm->penY, glyph, glyph_width, glyph_height, glyph_
width
);
}
/* Update current pen position */
}
/* Update current pen position */