X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Fgfx.h;h=7c05c245bd19c0f7f8aca47ad4ddf5267ba35bcf;hb=c050bdecde22c15215c52b55a6107cf74147508c;hp=af8f6a9aa6b92edd69bea66f9844726378f2eb7b;hpb=68d5a6796ff0efc9666ae359be2150d9638182f6;p=bertos.git

diff --git a/gfx/gfx.h b/gfx/gfx.h
index af8f6a9a..7c05c245 100755
--- a/gfx/gfx.h
+++ b/gfx/gfx.h
@@ -14,6 +14,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.5  2006/01/17 02:31:29  bernie
+ *#* Add bitmap format support; Improve some comments.
+ *#*
+ *#* Revision 1.4  2006/01/16 03:30:57  bernie
+ *#* Make header C++ friendly.
+ *#*
+ *#* Revision 1.3  2005/11/27 23:33:40  bernie
+ *#* Use appconfig.h instead of cfg/config.h.
+ *#*
  *#* Revision 1.2  2005/11/04 18:17:45  bernie
  *#* Fix header guards and includes for new location of gfx module.
  *#*
@@ -36,10 +45,11 @@
 #ifndef GFX_GFX_H
 #define GFX_GFX_H
 
-#include <cfg/config.h>
+#include <appconfig.h>
 #include <cfg/compiler.h>
 #include <cfg/cpu.h>
 
+EXTERN_C_BEGIN
 
 /*! Common type for coordinates expressed in pixel units */
 typedef int coord_t;
@@ -60,6 +70,7 @@ 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() */
 
 	Rect cr;                /*!< Clip drawing inside this rectangle */
@@ -102,4 +113,6 @@ extern coord_t gfx_transformY(Bitmap *bm, vcoord_t y);
 extern void gfx_vline(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t y2);
 #endif /* CONFIG_GFX_VCOORDS */
 
+EXTERN_C_END
+
 #endif /* GFX_GFX_H */