X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Fgfx_p.h;h=101eb12c89ae85cc39f84498c183e6c7fc8ff0d1;hb=dd10467603da0be5d35d91bae7c62b0079128d09;hp=8482d8e6bd91baa333af0c5a91bf4e923eb8e6fb;hpb=d55b8fe80965724ece68c9e8467ad93ab35babe3;p=bertos.git

diff --git a/gfx/gfx_p.h b/gfx/gfx_p.h
index 8482d8e6..101eb12c 100755
--- a/gfx/gfx_p.h
+++ b/gfx/gfx_p.h
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.3  2006/02/15 09:10:15  bernie
+ *#* Implement prop fonts; Fix algo styles.
+ *#*
  *#* Revision 1.2  2006/02/10 12:28:33  bernie
  *#* Add font support in bitmaps; Make bitmap formats public.
  *#*
@@ -29,14 +32,21 @@
 
 #if CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_H_MSB
 
+	//TODO: Collapse with RAST_* macros
 	#define BM_ADDR(bm, x, y)  ((bm)->raster + (y) * (bm)->stride + ((x) / 8))
 	#define BM_MASK(bm, x, y)  (1 << (7 - (x) % 8))
 
+	#define RAST_ADDR(raster, x, y, stride)  ((raster) + (y) * (stride) + (x) / 8)
+	#define RAST_MASK(raster, x, y)		 (1 << (7 - (x) % 8))
+
 #elif CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_V_LSB
 
 	#define BM_ADDR(bm, x, y)  ((bm)->raster + ((y) / 8) * (bm)->stride + (x))
 	#define BM_MASK(bm, x, y)  (1 << ((y) % 8))
 
+	// FIXME: not the same format of bitmaps!
+	#define RAST_ADDR(raster, x, y, stride)  ((raster) + (y) / 8 + (x) * (stride))
+	#define RAST_MASK(raster, x, y)          (1 << ((y) % 8))
 #else
 	#error Unknown value of CONFIG_BITMAP_FMT
 #endif /* CONFIG_BITMAP_FMT */
@@ -84,5 +94,7 @@
 #define BM_READPIXEL(bm, x, y) \
 	( *BM_ADDR(bm, x, y) & BM_MASK(bm, x, y) ? 1 : 0 )
 
+#define RAST_READPIXEL(raster, x, y, stride) \
+		( *RAST_ADDR(raster, x, y, stride) & RAST_MASK(raster, x, y) ? 1 : 0 )
 
 #endif /* GFX_GFX_P_H */