Factor out, simplify and document clipping.

[bertos.git] / gfx / gfx_p.h

diff --git a/gfx/gfx_p.h b/gfx/gfx_p.h
index 8482d8e6bd91baa333af0c5a91bf4e923eb8e6fb..a599a8aa9ca8b903a58df4f2b3cd8f09f02abf70 100755 (executable)
--- a/gfx/gfx_p.h
+++ b/gfx/gfx_p.h
@@ -15,6 +15,18 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
  *#*
@@ -26,21 +38,31 @@
 #ifndef GFX_GFX_P_H
 #define GFX_GFX_P_H
 
+#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.
  *
@@ -84,5 +106,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 */