X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=gfx%2Fline.c;h=eb7deb8ec1f14727351c80d4763f6e617caecadd;hb=6cc971430fda3760940c8f92bb484a6145bbad8d;hp=b3e74f03a9f1d4d5e84bd9557d19e30052db78be;hpb=03d72c14a213544bfe50fd9145fe0e4c9f9229c8;p=bertos.git

diff --git a/gfx/line.c b/gfx/line.c
index b3e74f03..eb7deb8e 100755
--- a/gfx/line.c
+++ b/gfx/line.c
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
@@ -16,6 +16,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2006/08/01 12:22:00  bernie
+ *#* gfx_findRegion(): Only define when CONFIG_GFX_CLIPPING is enabled.
+ *#*
+ *#* Revision 1.3  2006/07/19 12:56:26  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.2  2006/02/10 12:26:58  bernie
+ *#* Check CONFIG_* constraints.
+ *#*
  *#* Revision 1.1  2006/01/24 02:17:49  bernie
  *#* Split out gfx.c into bitmap.c and line.c.
  *#*
@@ -29,7 +38,15 @@
 #include <cfg/macros.h>  /* SWAP() */
 #include <appconfig.h>   /* CONFIG_GFX_CLIPPING */
 
-/*!
+/* Configuration sanity checks */
+#if !defined(CONFIG_GFX_CLIPPING) || (CONFIG_GFX_CLIPPING != 0 && CONFIG_GFX_CLIPPING != 1)
+	#error CONFIG_GFX_CLIPPING must be defined to either 0 or 1
+#endif
+#if !defined(CONFIG_GFX_VCOORDS) || (CONFIG_GFX_VCOORDS != 0 && CONFIG_GFX_VCOORDS != 1)
+	#error CONFIG_GFX_VCOORDS must be defined to either 0 or 1
+#endif
+
+/**
  * Draw a sloped line without performing clipping.
  *
  * Parameters are the same of gfx_line().
@@ -117,7 +134,9 @@ static void gfx_lineUnclipped(Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, co
 	}
 }
 
-//! Helper routine for gfx_line().
+#if CONFIG_GFX_CLIPPING
+
+/// Helper routine for gfx_line().
 static int gfx_findRegion(int x, int y, Rect *cr)
 {
 	int code = 0;
@@ -135,6 +154,8 @@ static int gfx_findRegion(int x, int y, Rect *cr)
 	return code;
 }
 
+#endif /* CONFIG_CLIPPING */
+
 /**
  * Draw a sloped line segment.
  *
@@ -211,7 +232,7 @@ void gfx_line(Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2)
 	gfx_lineUnclipped(bm, x1, y1, x2, y2);
 }
 
-/*!
+/**
  * Move the current pen position to the specified coordinates.
  *
  * The pen position is used for drawing operations such as
@@ -223,7 +244,7 @@ void gfx_moveTo(Bitmap *bm, coord_t x, coord_t y)
 	bm->penY = y;
 }
 
-/*!
+/**
  * Draw a line from the current pen position to the new coordinates.
  *
  * \note This function moves the current pen position to the
@@ -238,7 +259,7 @@ void gfx_lineTo(Bitmap *bm, coord_t x, coord_t y)
 }
 
 
-/*!
+/**
  * Draw the perimeter of an hollow rectangle.
  *
  * \note The bottom-right corner of the rectangle is drawn at (x2-1;y2-1).
@@ -258,7 +279,7 @@ void gfx_rectDraw(Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2)
 }
 
 
-/*!
+/**
  * Fill a rectangular area with \a color.
  *
  * \note The bottom-right border of the rectangle is not drawn.
@@ -283,7 +304,7 @@ void gfx_rectFillC(Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2, u
 	if (y2 < bm->cr.ymin)   y2 = bm->cr.ymin;
 	if (y1 > bm->cr.ymax)   y1 = bm->cr.ymax;
 	if (y2 > bm->cr.ymax)   y2 = bm->cr.ymax;
-#endif
+#endif /* CONFIG_GFX_CLIPPING */
 
 	/* NOTE: Code paths are duplicated for efficiency */
 	if (color) /* fill */
@@ -301,7 +322,7 @@ void gfx_rectFillC(Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2, u
 }
 
 
-/*!
+/**
  * Draw a filled rectangle.
  *
  * \note The bottom-right border of the rectangle is not drawn.
@@ -314,7 +335,7 @@ void gfx_rectFill(Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2)
 }
 
 
-/*!
+/**
  * Clear a rectangular area.
  *
  * \note The bottom-right border of the rectangle is not cleared.
@@ -328,7 +349,7 @@ void gfx_rectClear(Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2)
 
 
 #if CONFIG_GFX_VCOORDS
-/*!
+/**
  * Imposta gli estremi del sistema di coordinate cartesiane rispetto
  * al rettangolo di clipping della bitmap.
  */
@@ -348,7 +369,7 @@ void gfx_setViewRect(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t
 }
 
 
-/*!
+/**
  * Transform a coordinate from the current reference system to a
  * pixel offset within the bitmap.
  */
@@ -357,7 +378,7 @@ coord_t gfx_transformX(Bitmap *bm, vcoord_t x)
 	return bm->cr.xmin + (coord_t)((x - bm->orgX) * bm->scaleX);
 }
 
-/*!
+/**
  * Transform a coordinate from the current reference system to a
  * pixel offset within the bitmap.
  */
@@ -367,7 +388,7 @@ coord_t gfx_transformY(Bitmap *bm, vcoord_t y)
 }
 
 
-/*!
+/**
  * Draw a line from (x1;y1) to (x2;y2).
  */
 void gfx_vline(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t y2)