Restore corret version of config file.

[bertos.git] / gfx / line.c

diff --git a/gfx/line.c b/gfx/line.c
old mode 100755 (executable)
new mode 100644 (file)
index 41e00cc..f3909b1
--- a/gfx/line.c
+++ b/gfx/line.c
@@ -1,9 +1,34 @@
-/*!
+/**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \version $Id$
@@ -14,21 +39,10 @@
  * \brief Line drawing graphics routines
  */
 
-/*#*
- *#* $Log$
- *#* 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.
- *#*
- *#*/
-
 #include "gfx.h"
 #include "gfx_p.h"
 
 #include <cfg/debug.h>   /* ASSERT() */
-#include <cfg/cpu.h>     /* CPU_HARVARD */
 #include <cfg/macros.h>  /* SWAP() */
 #include <appconfig.h>   /* CONFIG_GFX_CLIPPING */
 
@@ -40,7 +54,7 @@
        #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().
@@ -128,7 +142,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;
@@ -146,6 +162,8 @@ static int gfx_findRegion(int x, int y, Rect *cr)
        return code;
 }
 
+#endif /* CONFIG_CLIPPING */
+
 /**
  * Draw a sloped line segment.
  *
@@ -222,7 +240,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
@@ -234,7 +252,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
@@ -249,7 +267,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).
@@ -269,7 +287,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.
@@ -312,7 +330,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.
@@ -325,7 +343,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.
@@ -339,7 +357,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.
  */
@@ -359,7 +377,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.
  */
@@ -368,7 +386,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.
  */
@@ -378,7 +396,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)