X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Ftext.c;h=f84fe222743583e357dafe2ed1ee45d8c7ba4a2e;hb=22853ba2260f6dd8dc0e5ccafb95e75fc36cfa29;hp=fd8868fd80d7c7bc43cb7aeb645ed5fe4785aba1;hpb=1a3aed4dd1bf9448fd36e95f47280ffc042dd570;p=bertos.git

diff --git a/mware/text.c b/mware/text.c
index fd8868fd..f84fe222 100755
--- a/mware/text.c
+++ b/mware/text.c
@@ -15,6 +15,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.12  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.11  2005/01/20 18:46:31  aleph
+ *#* Fix progmem includes.
+ *#*
+ *#* Revision 1.10  2005/01/08 09:20:12  bernie
+ *#* Really make it work on both architectures.
+ *#*
+ *#* Revision 1.9  2004/12/31 16:44:29  bernie
+ *#* Sanitize for non-Harvard processors.
+ *#*
  *#* Revision 1.8  2004/11/16 21:16:28  bernie
  *#* Update to new naming scheme in mware/gfx.c.
  *#*
@@ -58,7 +70,9 @@
 #include "gfx.h"
 #include "font.h"
 #include "text.h"
-#include <debug.h>
+
+#include <cfg/debug.h>
+
 
 /*!
  * Flags degli stili algoritmici
@@ -148,7 +162,7 @@ static int text_putglyph(char c, struct Bitmap *bm)
 		/* Per ogni colonna di dot del glyph... */
 		for (i = 0; i < glyph_width; ++i)
 		{
-			dots = pgm_read_byte(glyph);
+			dots = PGM_READ_CHAR(glyph);
 
 			/* Advance to next column in glyph.
 			 * Expand: advances only once every two columns
@@ -186,7 +200,7 @@ static int text_putglyph(char c, struct Bitmap *bm)
 	}
 	else /* No style: fast vanilla copy of glyph to line buffer */
 		while (glyph_width--)
-			*buf++ = pgm_read_byte(glyph++);
+			*buf++ = PGM_READ_CHAR(glyph++);
 
 	return c;
 }