/*#*
*#* $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.
*#*
/*! 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 */
/* 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
{
* 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);