Use demo as default app.

[bertos.git] / gfx / gfx.h

diff --git a/gfx/gfx.h b/gfx/gfx.h
index 5fe1e30016153f7ae0b1818acad099f014d3f942..2c48b27be5e5b934306c2a35e16a8944f4ae776b 100755 (executable)
--- a/gfx/gfx.h
+++ b/gfx/gfx.h
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999 Bernardo Innocenti <bernie@develer.com>
@@ -14,6 +14,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.18  2006/08/01 12:45:01  bernie
+ *#* Remove Bitmap::cr when not needed.
+ *#*
+ *#* Revision 1.17  2006/07/19 12:56:26  bernie
+ *#* Convert to new Doxygen style.
+ *#*
  *#* Revision 1.16  2006/05/27 17:17:34  bernie
  *#* Optimize away divisions in RAST_ADDR/MASK macros.
  *#*
@@ -79,12 +85,12 @@
 
 EXTERN_C_BEGIN
 
-/*! Common type for coordinates expressed in pixel units */
+/** 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 */
+/** Common type for coordinates expressed in logical units */
 typedef float vcoord_t;
 #endif /* CONFIG_GFX_VCOORDS */
 
@@ -138,12 +144,14 @@ struct Font;
  */
 typedef struct Bitmap
 {
-       uint8_t *raster;        /*!< Pointer to byte array to hold the data */
-       coord_t width, height;  /*!< Width/Height in pixels */
-       coord_t stride;         /*!< Bytes per row. */
-       coord_t penX, penY;     /*!< Current pen position MoveTo()/LineTo() */
+       uint8_t *raster;        /**< Pointer to byte array to hold the data */
+       coord_t width, height;  /**< Width/Height in pixels */
+       coord_t stride;         /**< Bytes per row. */
+       coord_t penX, penY;     /**< Current pen position MoveTo()/LineTo() */
 
-       Rect cr;                /*!< Clip drawing inside this rectangle */
+#if CONFIG_GFX_CLIPPING || CONFIG_GFX_VCOORDS
+       Rect cr;                /**< Clip drawing inside this rectangle */
+#endif
 
 #if CONFIG_GFX_TEXT
        const struct Font *font;/**< Current font for text rendering. */
@@ -158,9 +166,10 @@ typedef struct Bitmap
         * \see text_style()
         */
        uint8_t styles;
-#endif
+#endif /* CONFIG_GFX_TEXT */
+
 #if CONFIG_GFX_VCOORDS
-       /*!
+       /**
         * \name Logical coordinate system
         * \{
         */
@@ -178,10 +187,10 @@ typedef struct Bitmap
  */
 typedef struct Image
 {
-       const uint8_t *raster;   /*!< Pointer to byte array to hold the data. */
-       coord_t width;     /*!< Raster width in pixels. */
-       coord_t height;    /*!< Raster height in pixels. */
-       coord_t stride;    /*!< Bytes per row. */
+       const uint8_t *raster;   /**< Pointer to byte array to hold the data. */
+       coord_t width;     /**< Raster width in pixels. */
+       coord_t height;    /**< Raster height in pixels. */
+       coord_t stride;    /**< Bytes per row. */
 } Image;
 
 #if CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_H_MSB