X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Fgfx_p.h;h=0df757187da4955bc47121800db47500d81eeb71;hb=6b2099c56772961182353617a8d4b839f6a1a6db;hp=101eb12c89ae85cc39f84498c183e6c7fc8ff0d1;hpb=39108834d9c102712d6c11830ca9b9fb5b098d19;p=bertos.git

diff --git a/gfx/gfx_p.h b/gfx/gfx_p.h
index 101eb12c..0df75718 100755
--- a/gfx/gfx_p.h
+++ b/gfx/gfx_p.h
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2006/03/22 09:50:37  bernie
+ *#* Use the same format for fonts and rasters.
+ *#*
  *#* Revision 1.3  2006/02/15 09:10:15  bernie
  *#* Implement prop fonts; Fix algo styles.
  *#*
@@ -32,25 +35,20 @@
 
 #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_ADDR(raster, x, y, stride)  ((raster) + ((y) / 8) * (stride) + (x))
 	#define RAST_MASK(raster, x, y)          (1 << ((y) % 8))
 #else
 	#error Unknown value of CONFIG_BITMAP_FMT
 #endif /* CONFIG_BITMAP_FMT */
 
+#define BM_ADDR(bm, x, y)  RAST_ADDR((bm)->raster, (x), (y), (bm)->stride)
+#define BM_MASK(bm, x, y)  RAST_MASK((bm)->raster, (x), (y))
+
 /*!
  * Plot a pixel in bitmap \a bm.
  *