From 68d5a6796ff0efc9666ae359be2150d9638182f6 Mon Sep 17 00:00:00 2001 From: bernie Date: Fri, 4 Nov 2005 18:17:45 +0000 Subject: [PATCH] Fix header guards and includes for new location of gfx module. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@440 38d2e660-2303-0410-9eaa-f027e97ec537 --- gfx/charts.c | 5 ++++- gfx/charts.h | 11 +++++++---- gfx/font.c | 23 +++++------------------ gfx/font.h | 11 +++++++---- gfx/gfx.c | 31 +++++-------------------------- gfx/gfx.h | 32 +++++++------------------------- gfx/text.c | 11 +++++++---- gfx/text.h | 9 ++++++--- gfx/text_format.c | 12 ++++++++---- 9 files changed, 56 insertions(+), 89 deletions(-) diff --git a/gfx/charts.c b/gfx/charts.c index 945070db..79b178c0 100755 --- a/gfx/charts.c +++ b/gfx/charts.c @@ -26,6 +26,9 @@ /*#* *#* $Log$ + *#* Revision 1.2 2005/11/04 18:17:45 bernie + *#* Fix header guards and includes for new location of gfx module. + *#* *#* Revision 1.1 2005/11/04 18:11:35 bernie *#* Move graphics stuff from mware/ to gfx/. *#* @@ -46,7 +49,7 @@ *#* *#*/ -#include "charts.h" +#include #include diff --git a/gfx/charts.h b/gfx/charts.h index 468af79b..af9ee6dd 100755 --- a/gfx/charts.h +++ b/gfx/charts.h @@ -18,6 +18,9 @@ /*#* *#* $Log$ + *#* Revision 1.2 2005/11/04 18:17:45 bernie + *#* Fix header guards and includes for new location of gfx module. + *#* *#* Revision 1.1 2005/11/04 18:11:35 bernie *#* Move graphics stuff from mware/ to gfx/. *#* @@ -37,10 +40,10 @@ *#* Import simple chart drawing code. *#* *#*/ -#ifndef MWARE_CHARTS_H -#define MWARE_CHARTS_H +#ifndef GFX_CHARTS_H +#define GFX_CHARTS_H -#include /* vcoord_t */ +#include /* vcoord_t */ #include /* CONFIG_ stuff */ /*! @@ -80,4 +83,4 @@ void chart_drawAxis(Bitmap *bm); void chart_drawCurve(Bitmap *bm, const chart_y_t *curve_y, int curve_cnt); void chart_drawDots(Bitmap *bm, const chart_x_t *dots_x, const chart_y_t *dots_y, int cnt); -#endif /* MWARE_CHARTS_H */ +#endif /* GFX_CHARTS_H */ diff --git a/gfx/font.c b/gfx/font.c index fe7988fe..934f851a 100755 --- a/gfx/font.c +++ b/gfx/font.c @@ -1,8 +1,8 @@ /*! * \file * * @@ -15,6 +15,9 @@ /*#* *#* $Log$ + *#* Revision 1.2 2005/11/04 18:17:45 bernie + *#* Fix header guards and includes for new location of gfx module. + *#* *#* Revision 1.1 2005/11/04 18:11:35 bernie *#* Move graphics stuff from mware/ to gfx/. *#* @@ -35,22 +38,6 @@ *#* *#* Revision 1.1 2004/05/23 15:43:16 bernie *#* Import mware modules. - *#* - *#* Revision 1.5 2004/03/24 15:48:53 bernie - *#* Remove Copyright messages from Doxygen output - *#* - *#* Revision 1.4 2004/03/03 18:30:17 bernie - *#* Substitute left triangle glyph with left arrow - *#* - *#* Revision 1.3 2004/02/28 14:48:33 aleph - *#* Improve arrow glyphs - *#* - *#* Revision 1.2 2004/01/13 12:15:28 aleph - *#* Move font table in program memory; add font.h - *#* - *#* Revision 1.1 2004/01/07 23:31:54 aleph - *#* Add text routines - *#* *#*/ #include "font.h" diff --git a/gfx/font.h b/gfx/font.h index 049db533..1f5d2780 100755 --- a/gfx/font.h +++ b/gfx/font.h @@ -14,6 +14,9 @@ /*#* *#* $Log$ + *#* Revision 1.2 2005/11/04 18:17:45 bernie + *#* Fix header guards and includes for new location of gfx module. + *#* *#* Revision 1.1 2005/11/04 18:11:35 bernie *#* Move graphics stuff from mware/ to gfx/. *#* @@ -42,8 +45,8 @@ *#* Move font table in program memory; add font.h *#* *#*/ -#ifndef MWARE_FONT_H -#define MWARE_FONT_H +#ifndef GFX_FONT_H +#define GFX_FONT_H #include /* uint8_t */ #include /* PROGMEM */ @@ -56,7 +59,7 @@ #define FONT_HEIGHT 8 /* \} */ -/*! Font table */ +/*! Font table. */ extern const PROGMEM uint8_t font[256 * FONT_WIDTH]; -#endif /* MWARE_FONT_H */ +#endif /* GFX_FONT_H */ diff --git a/gfx/gfx.c b/gfx/gfx.c index aa0e56e7..82b69c34 100755 --- a/gfx/gfx.c +++ b/gfx/gfx.c @@ -1,7 +1,7 @@ /*! * \file * @@ -16,6 +16,9 @@ /*#* *#* $Log$ + *#* Revision 1.2 2005/11/04 18:17:45 bernie + *#* Fix header guards and includes for new location of gfx module. + *#* *#* Revision 1.1 2005/11/04 18:11:35 bernie *#* Move graphics stuff from mware/ to gfx/. *#* @@ -27,33 +30,9 @@ *#* *#* Revision 1.12 2005/03/01 23:26:45 bernie *#* Use new CPU-neutral program-memory API. - *#* - *#* Revision 1.11 2004/12/08 08:06:16 bernie - *#* Remove done todo. - *#* - *#* Revision 1.10 2004/11/01 15:14:07 bernie - *#* Update to current coding conventions. - *#* - *#* Revision 1.9 2004/10/21 10:58:33 bernie - *#* Add a TODO item. - *#* - *#* Revision 1.8 2004/09/20 03:29:22 bernie - *#* Relax assertion. - *#* - *#* Revision 1.7 2004/09/14 21:01:08 bernie - *#* Rename rectangle drawing functions; Unify filled/cleared implementations. - *#* - *#* Revision 1.4 2004/08/24 16:53:10 bernie - *#* Use new-style config macros. - *#* - *#* Revision 1.3 2004/08/04 03:16:59 bernie - *#* Switch to new DevLib CONFIG_ convention. - *#* - *#* Revision 1.2 2004/06/03 11:27:09 bernie - *#* Add dual-license information. *#*/ -#include "gfx.h" +#include #include /* CONFIG_GFX_CLIPPING */ #include #include /* CPU_HARVARD */ diff --git a/gfx/gfx.h b/gfx/gfx.h index 788bd69f..af8f6a9a 100755 --- a/gfx/gfx.h +++ b/gfx/gfx.h @@ -1,6 +1,6 @@ /*! * \file - * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/) + * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/) * Copyright 1999 Bernardo Innocenti * This file is part of DevLib - See README.devlib for information. * @@ -14,6 +14,9 @@ /*#* *#* $Log$ + *#* Revision 1.2 2005/11/04 18:17:45 bernie + *#* Fix header guards and includes for new location of gfx module. + *#* *#* Revision 1.1 2005/11/04 18:11:35 bernie *#* Move graphics stuff from mware/ to gfx/. *#* @@ -28,31 +31,10 @@ *#* *#* Revision 1.9 2005/01/20 18:46:31 aleph *#* Fix progmem includes. - *#* - *#* Revision 1.8 2004/11/01 15:14:07 bernie - *#* Update to current coding conventions. - *#* - *#* Revision 1.7 2004/09/20 03:29:06 bernie - *#* Conditionalize AVR-specific code. - *#* - *#* Revision 1.6 2004/09/14 21:01:08 bernie - *#* Rename rectangle drawing functions; Unify filled/cleared implementations. - *#* - *#* Revision 1.4 2004/08/10 07:00:16 bernie - *#* Add missing header. - *#* - *#* Revision 1.3 2004/08/04 03:16:59 bernie - *#* Switch to new DevLib CONFIG_ convention. - *#* - *#* Revision 1.2 2004/06/03 11:27:09 bernie - *#* Add dual-license information. - *#* - *#* Revision 1.1 2004/05/23 15:43:16 bernie - *#* Import mware modules. *#*/ -#ifndef MWARE_GFX_H -#define MWARE_GFX_H +#ifndef GFX_GFX_H +#define GFX_GFX_H #include #include @@ -120,4 +102,4 @@ extern coord_t gfx_transformY(Bitmap *bm, vcoord_t y); extern void gfx_vline(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t y2); #endif /* CONFIG_GFX_VCOORDS */ -#endif /* MWARE_GFX_H */ +#endif /* GFX_GFX_H */ diff --git a/gfx/text.c b/gfx/text.c index 084e9511..3e980601 100755 --- a/gfx/text.c +++ b/gfx/text.c @@ -1,7 +1,7 @@ /*! * \file * @@ -15,6 +15,9 @@ /*#* *#* $Log$ + *#* Revision 1.2 2005/11/04 18:17:45 bernie + *#* Fix header guards and includes for new location of gfx module. + *#* *#* Revision 1.1 2005/11/04 18:11:35 bernie *#* Move graphics stuff from mware/ to gfx/. *#* @@ -73,9 +76,9 @@ *#* documentation fixes *#*/ -#include "gfx.h" -#include "font.h" -#include "text.h" +#include +#include +#include #include diff --git a/gfx/text.h b/gfx/text.h index d131e014..a064e8c9 100755 --- a/gfx/text.h +++ b/gfx/text.h @@ -15,6 +15,9 @@ /*#* *#* $Log$ + *#* Revision 1.2 2005/11/04 18:17:45 bernie + *#* Fix header guards and includes for new location of gfx module. + *#* *#* Revision 1.1 2005/11/04 18:11:35 bernie *#* Move graphics stuff from mware/ to gfx/. *#* @@ -50,8 +53,8 @@ *#* *#*/ -#ifndef MWARE_TEXT_H -#define MWARE_TEXT_H +#ifndef GFX_TEXT_H +#define GFX_TEXT_H #include #include /* BV() */ @@ -122,4 +125,4 @@ int text_vwidthf_P(struct Bitmap *bm, const char * PROGMEM fmt, va_list ap); int text_widthf_P(struct Bitmap *bm, const char * PROGMEM fmt, ...); #endif /* CPU_HARVARD */ -#endif /* MWARE_TEXT_H */ +#endif /* GFX_TEXT_H */ diff --git a/gfx/text_format.c b/gfx/text_format.c index 36dfec37..c56eea6b 100755 --- a/gfx/text_format.c +++ b/gfx/text_format.c @@ -15,6 +15,9 @@ /*#* *#* $Log$ + *#* Revision 1.2 2005/11/04 18:17:45 bernie + *#* Fix header guards and includes for new location of gfx module. + *#* *#* Revision 1.1 2005/11/04 18:11:35 bernie *#* Move graphics stuff from mware/ to gfx/. *#* @@ -56,10 +59,11 @@ *#* *#*/ -#include "text.h" -#include "formatwr.h" /* _formatted_write() */ -#include "font.h" -#include "gfx.h" +#include +#include +#include +#include /* _formatted_write() */ + #include /* vsprintf() */ #include #include /* strlen() */ -- 2.25.1