Merge da SC: fixato namespace dell'include guard

[bertos.git] / mware / gfx.c

diff --git a/mware/gfx.c b/mware/gfx.c
index 930510e3017386254b71db35cd98459a64764b65..f4b0da33c40540cc69fff3c2128db9961179ccef 100755 (executable)
--- a/mware/gfx.c
+++ b/mware/gfx.c
@@ -1,9 +1,9 @@
 /*!
  * \file
  * <!--
- * Copyright (C) 1999 Bernardo Innocenti <bernie@develer.com>
- * Copyright (C) 2003 Develer S.r.l. (http://www.develer.com/)
- * All Rights Reserved.
+ * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 1999 Bernardo Innocenti <bernie@develer.com>
+ * This file is part of DevLib - See devlib/README for information.
  * -->
  *
  * \version $Id$
@@ -16,26 +16,11 @@
 
 /*
  * $Log$
- * Revision 1.1  2004/05/23 15:43:16  bernie
- * Import mware modules.
+ * Revision 1.3  2004/08/04 03:16:59  bernie
+ * Switch to new DevLib CONFIG_ convention.
  *
- * Revision 1.6  2004/03/24 15:03:45  bernie
- * Use explicit include paths; clean Doxygen comments
- *
- * Revision 1.5  2004/02/09 00:21:28  aleph
- * Various gfx fixes
- *
- * Revision 1.4  2004/01/27 23:24:19  aleph
- * Add new graphics primitives
- *
- * Revision 1.3  2004/01/13 00:05:23  aleph
- * Fix clipping bug
- *
- * Revision 1.2  2004/01/07 23:33:01  aleph
- * Change copyright email
- *
- * Revision 1.1  2004/01/07 19:05:31  aleph
- * Add graphics routines
+ * Revision 1.2  2004/06/03 11:27:09  bernie
+ * Add dual-license information.
  *
  */
 
@@ -352,7 +337,7 @@ void gfx_SetClipRect(Bitmap *bm, coord_t minx, coord_t miny, coord_t maxx, coord
 }
 
 
-#ifdef CONFIG_LCD_VCOORDS
+#if CONFIG_GFX_VCOORDS
 /*!
  * Imposta gli estremi del sistema di coordinate cartesiane rispetto
  * al rettangolo di clipping della bitmap.
@@ -401,4 +386,4 @@ void gfx_VDrawLine(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t y
                gfx_TransformX(bm, x1), gfx_TransformY(bm, y1),
                gfx_TransformY(bm, x2), gfx_TransformY(bm, y2));
 }
-#endif /* CONFIG_LCD_VCOORDS */
+#endif /* CONFIG_GFX_VCOORDS */