X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fgfx%2Fgfx.h;h=eeef5bc7b9dd19887997eb96ccae49e7bb9a6095;hb=08c8730ec883c21e45a0c475b5c7032f9fdd93a4;hp=38ce8902e28d3a5e0408ee6de4db5a89308cd835;hpb=11da44352fcd4d33b173c976db45293ac1a87cca;p=bertos.git

diff --git a/bertos/gfx/gfx.h b/bertos/gfx/gfx.h
index 38ce8902..eeef5bc7 100644
--- a/bertos/gfx/gfx.h
+++ b/bertos/gfx/gfx.h
@@ -1,12 +1,12 @@
 /**
  * \file
  * Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999 Bernardo Innocenti <bernie@develer.com>
+ * Copyright 1999 Bernie Innocenti <bernie@codewiz.org>
  *
  *
  * \version $Id$
  *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
  *
  * \brief General pourpose graphics routines
@@ -15,7 +15,7 @@
 #ifndef GFX_GFX_H
 #define GFX_GFX_H
 
-#include <cfg/cfg_gfx.h>    /* CONFIG_GFX_* */
+#include "cfg/cfg_gfx.h"    /* CONFIG_GFX_* */
 #include <cfg/compiler.h>
 
 #include <cpu/attr.h>       /* CPU_HARVARD */
@@ -154,7 +154,7 @@ typedef struct Image
 	 * Compute the size in bytes of a raster suitable for
 	 * holding a bitmap of \a width x \a height pixels.
 	 */
-	#define RAST_SIZE(width, height) ( ((width) + 7 / 8) * (height) )
+	#define RAST_SIZE(width, height) ( (((width) + 7) / 8) * (height) )
 
 #elif CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_V_LSB
 	/**
@@ -182,7 +182,7 @@ void gfx_lineTo     (Bitmap *bm, coord_t x,  coord_t y);
 void gfx_setClipRect(Bitmap *bm, coord_t xmin, coord_t ymin, coord_t xmax, coord_t ymax);
 
 #if CPU_HARVARD
-	#include <mware/pgm.h>
+	#include <cpu/pgm.h>
 	void gfx_blit_P(Bitmap *bm, const pgm_uint8_t *raster);
 #endif