X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Fgfx_p.h;h=738eb09ebbb6819296b0d258dd444efc2a0ecf92;hb=8b022f0d098ab63e708d05634b6d1b3f1dc58815;hp=5afc26e4321de175bf1d494293b5f4805b534752;hpb=59522a49bb5e019984284cc75a99b49a5e1c5f4e;p=bertos.git

diff --git a/gfx/gfx_p.h b/gfx/gfx_p.h
index 5afc26e4..738eb09e 100755
--- a/gfx/gfx_p.h
+++ b/gfx/gfx_p.h
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
@@ -15,6 +15,24 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.7  2006/07/19 12:56:26  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.6  2006/05/27 17:17:34  bernie
+ *#* Optimize away divisions in RAST_ADDR/MASK macros.
+ *#*
+ *#* Revision 1.5  2006/05/25 23:35:40  bernie
+ *#* Cleanup.
+ *#*
+ *#* 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.
+ *#*
+ *#* Revision 1.2  2006/02/10 12:28:33  bernie
+ *#* Add font support in bitmaps; Make bitmap formats public.
+ *#*
  *#* Revision 1.1  2006/01/26 00:32:49  bernie
  *#* Graphics private header.
  *#*
@@ -23,29 +41,32 @@
 #ifndef GFX_GFX_P_H
 #define GFX_GFX_P_H
 
-/**
- * \name Known pixel formats for bitmap representation.
- * \{
- */
-#define BITMAP_FMT_PLANAR_H_MSB  1  /**< Planar pixels, horizontal bytes, MSB left. */
-#define BITMAP_FMT_PLANAR_V_LSB  2  /**< Planar pixels, vertical bytes, LSB top. */
-/* \} */
+#include <gfx/gfx.h>
 
 #if CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_H_MSB
 
-	#define BM_ADDR(bm, x, y)  ((bm)->raster + (y) * (bm)->stride + ((x) / 8))
-	#define BM_MASK(bm, x, y)  (1 << (7 - (x) % 8))
+	/* We use ucoord_t to let the compiler optimize away the division/modulo. */
+	#define RAST_ADDR(raster, x, y, stride) \
+			((raster) + (ucoord_t)(y) * (ucoord_t)(stride) + (ucoord_t)(x) / 8)
+	#define RAST_MASK(raster, x, y) \
+			(1 << (7 - (ucoord_t)(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))
+	/* We use ucoord_t to let the compiler optimize away the division/modulo. */
+	#define RAST_ADDR(raster, x, y, stride) \
+			((raster) + ((ucoord_t)(y) / 8) * (ucoord_t)(stride) + (ucoord_t)(x))
+	#define RAST_MASK(raster, x, y) \
+			(1 << ((ucoord_t)(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.
  *
  * \note bm is evaluated twice.
@@ -54,7 +75,7 @@
 #define BM_PLOT(bm, x, y) \
 	( *BM_ADDR(bm, x, y) |= BM_MASK(bm, x, y) )
 
-/*!
+/**
  * Clear a pixel in bitmap \a bm.
  *
  * \note bm is evaluated twice.
@@ -63,7 +84,7 @@
 #define BM_CLEAR(bm, x, y) \
 	( *BM_ADDR(bm, x, y) &= ~BM_MASK(bm, x, y) )
 
-/*!
+/**
  * Set a pixel in bitmap \a bm to the specified color.
  *
  * \note bm is evaluated twice.
@@ -77,7 +98,7 @@
 		*p = (*p & ~mask) | ((fg_pen) ? mask : 0); \
 	} while (0)
 
-/*!
+/**
  * Get the value of the pixel in bitmap \a bm.
  *
  * \return The returned value is either 0 or 1.
@@ -88,5 +109,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 */