X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Fbitmap.c;h=b7ed197c66dcb14f74fb3f5f4364df3c500e775e;hb=5f3952176a4e9a00ca8dd5ec4a6b994958f89e0a;hp=d74c7735487c64a2957a8e9c3c83381045162357;hpb=692e9c10552590debbd51552d71e49960f323b6b;p=bertos.git

diff --git a/gfx/bitmap.c b/gfx/bitmap.c
old mode 100755
new mode 100644
index d74c7735..b7ed197c
--- a/gfx/bitmap.c
+++ b/gfx/bitmap.c
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
@@ -6,48 +6,12 @@
  * This file is part of DevLib - See README.devlib for information.
  * -->
  *
- * \version $Id$
- *
  * \author Bernardo Innocenti <bernie@develer.com>
  * \author Stefano Fedrigo <aleph@develer.com>
  *
  * \brief Bitmap manipulation routines.
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.10  2006/05/27 17:21:15  bernie
- *#* Factor out, simplify and document clipping.
- *#*
- *#* Revision 1.9  2006/05/25 23:35:40  bernie
- *#* Cleanup.
- *#*
- *#* Revision 1.8  2006/03/27 04:48:56  bernie
- *#* gfx_blitImage(): New function; gfx_blitRaster(): Fix clipping bug.
- *#*
- *#* Revision 1.7  2006/03/07 22:18:04  bernie
- *#* Correctly compute text width for prop fonts; Make styles a per-bitmap attribute.
- *#*
- *#* Revision 1.6  2006/02/23 11:17:16  bernie
- *#* Documentation fixes.
- *#*
- *#* Revision 1.5  2006/02/15 09:10:15  bernie
- *#* Implement prop fonts; Fix algo styles.
- *#*
- *#* Revision 1.4  2006/02/10 12:32:33  bernie
- *#* Add multiple font support in bitmaps; gfx_blitRaster(): New function.
- *#*
- *#* Revision 1.3  2006/01/26 00:36:48  bernie
- *#* Const correctness for some new functions.
- *#*
- *#* Revision 1.2  2006/01/24 21:55:43  aleph
- *#* gfx_blit_P(): use RASTER_SIZE() to calculate raster size
- *#*
- *#* Revision 1.1  2006/01/24 02:17:49  bernie
- *#* Split out gfx.c into bitmap.c and line.c.
- *#*
- *#*/
-
 #include "gfx.h"
 #include "gfx_p.h"
 
@@ -63,7 +27,7 @@
 #endif
 
 
-/*!
+/**
  * Initialize a Bitmap structure with the provided parameters.
  *
  * \note The pen position is reset to the origin.
@@ -97,7 +61,7 @@ void gfx_bitmapInit(Bitmap *bm, uint8_t *raster, coord_t w, coord_t h)
 }
 
 
-/*!
+/**
  * Clear the whole bitmap surface to the background color.
  *
  * \note This function does \b not update the current pen position.
@@ -105,7 +69,7 @@ void gfx_bitmapInit(Bitmap *bm, uint8_t *raster, coord_t w, coord_t h)
  */
 void gfx_bitmapClear(Bitmap *bm)
 {
-	memset(bm->raster, 0, RASTER_SIZE(bm->width, bm->height));
+	memset(bm->raster, 0, RAST_SIZE(bm->width, bm->height));
 }
 
 
@@ -113,7 +77,7 @@ void gfx_bitmapClear(Bitmap *bm)
 
 #include <avr/pgmspace.h> /* FIXME: memcpy_P() */
 
-/*!
+/**
  * Copy a raster picture located in program memory in the bitmap.
  * The size of the raster to copy *must* be the same of the raster bitmap.
  *
@@ -121,7 +85,7 @@ void gfx_bitmapClear(Bitmap *bm)
  */
 void gfx_blit_P(Bitmap *bm, const pgm_uint8_t *raster)
 {
-	memcpy_P(bm->raster, raster, RASTER_SIZE(bm->width, bm->height));
+	memcpy_P(bm->raster, raster, RAST_SIZE(bm->width, bm->height));
 }
 #endif /* CPU_HARVARD */
 
@@ -237,7 +201,7 @@ void gfx_blitImage(Bitmap *dst, coord_t dxmin, coord_t dymin, const Image *image
 }
 
 
-#if CONFIG_GFX_CLIPPING
+#if CONFIG_GFX_CLIPPING || CONFIG_GFX_VCOORDS
 
 /**
  * Set the bitmap clipping rectangle to the specified coordinates.
@@ -245,9 +209,14 @@ void gfx_blitImage(Bitmap *dst, coord_t dxmin, coord_t dymin, const Image *image
  * All drawing performed on the bitmap will be clipped inside this
  * rectangle.
  *
+ * The clipping rectangle is also used as a bounding box for the
+ * logical view of the virtual coordinate system.
+ *
  * \note Following the convention used for all other operations, the
  *       top-left pixels of the rectangle are included, while the
  *       bottom-right pixels are considered outside the clipping region.
+ *
+ * \see gfx_setViewRect
  */
 void gfx_setClipRect(Bitmap *bm, coord_t minx, coord_t miny, coord_t maxx, coord_t maxy)
 {