Optimize away divisions in RAST_ADDR/MASK macros.

[bertos.git] / gfx / gfx.h

diff --git a/gfx/gfx.h b/gfx/gfx.h
index 2cfe5b5f29d33d371f04ebef32808487c1e034c0..5fe1e30016153f7ae0b1818acad099f014d3f942 100755 (executable)
--- a/gfx/gfx.h
+++ b/gfx/gfx.h
@@ -14,6 +14,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.16  2006/05/27 17:17:34  bernie
+ *#* Optimize away divisions in RAST_ADDR/MASK macros.
+ *#*
+ *#* Revision 1.15  2006/05/25 23:35:40  bernie
+ *#* Cleanup.
+ *#*
+ *#* Revision 1.14  2006/04/27 05:39:24  bernie
+ *#* Enhance text rendering to arbitrary x,y coords.
+ *#*
  *#* Revision 1.13  2006/04/11 00:08:24  bernie
  *#* text_offset(): New function, but I'm not quite confident with the design.
  *#*
@@ -72,6 +81,7 @@ EXTERN_C_BEGIN
 
 /*! Common type for coordinates expressed in pixel units */
 typedef int coord_t;
+typedef unsigned int ucoord_t;
 
 #if CONFIG_GFX_VCOORDS
 /*! Common type for coordinates expressed in logical units */
@@ -120,8 +130,11 @@ typedef struct Rect { coord_t xmin, ymin, xmax, ymax; } Rect;
 /* Fwd decl */
 struct Font;
 
-/*!
+/**
  * Control structure to draw in a bitmap
+ *
+ * \todo For better ortogonality, split this structure into
+ *       an Image and a plain drawing context called Painter.
  */
 typedef struct Bitmap
 {
@@ -141,6 +154,8 @@ typedef struct Bitmap
         * The text rendering routine can apply a few simple transformations
         * to the current font in order to generate common styles such as
         * bold, italic and underline from plain glyphs.
+        *
+        * \see text_style()
         */
        uint8_t styles;
 #endif
@@ -174,18 +189,19 @@ typedef struct Image
         * Compute the size in bytes of a raster suitable for
         * holding a bitmap of \a width x \a height pixels.
         */
-       #define RASTER_SIZE(width, height) ( ((width) + 7 / 8) * (height) )
+       #define RAST_SIZE(width, height) ( ((width) + 7 / 8) * (height) )
 
 #elif CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_V_LSB
        /**
         * Compute the size in bytes of a raster suitable for
         * holding a bitmap of \a width x \a height pixels.
         */
-       #define RASTER_SIZE(width, height) ( (width) * (((height) + 7) / 8) )
+       #define RAST_SIZE(width, height) ( (width) * (((height) + 7) / 8) )
 #else
        #error Unknown value of CONFIG_BITMAP_FMT
 #endif /* CONFIG_BITMAP_FMT */
 
+#define RASTER_SIZE RAST_SIZE /* OBSOLETE */
 
 /* Function prototypes */
 void gfx_bitmapInit (Bitmap *bm, uint8_t *raster, coord_t w, coord_t h);