X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Fline.c;h=c5a6046f75ddc06aa34921d76b67a46eb9b46a1a;hb=96bda3a8889719af5e4475aaf853487f2e99e01f;hp=280ed7b370cc8c4151ce0091955501a3f96b005c;hpb=bcf38f772b397e7a8ba781a69aacb9380e54b32a;p=bertos.git

diff --git a/gfx/line.c b/gfx/line.c
old mode 100755
new mode 100644
index 280ed7b3..c5a6046f
--- 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$
@@ -16,6 +41,9 @@
 
 /*#*
  *#* $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.
  *#*
@@ -31,7 +59,7 @@
 #include "gfx_p.h"
 
 #include <cfg/debug.h>   /* ASSERT() */
-#include <cfg/cpu.h>     /* CPU_HARVARD */
+#include <cpu/cpu.h>     /* CPU_HARVARD */
 #include <cfg/macros.h>  /* SWAP() */
 #include <appconfig.h>   /* CONFIG_GFX_CLIPPING */
 
@@ -131,6 +159,8 @@ static void gfx_lineUnclipped(Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, co
 	}
 }
 
+#if CONFIG_GFX_CLIPPING
+
 /// Helper routine for gfx_line().
 static int gfx_findRegion(int x, int y, Rect *cr)
 {
@@ -149,6 +179,8 @@ static int gfx_findRegion(int x, int y, Rect *cr)
 	return code;
 }
 
+#endif /* CONFIG_CLIPPING */
+
 /**
  * Draw a sloped line segment.
  *