From: bernie Date: Sat, 29 Sep 2007 16:30:37 +0000 (+0000) Subject: RASTER_SIZE(): Remove obsolete macro. X-Git-Tag: 1.0.0~426 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=6c1e871a96baf4245a04f0135d00fbea59af041c;p=bertos.git RASTER_SIZE(): Remove obsolete macro. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@815 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/app/demo/demo.c b/app/demo/demo.c index 35ece014..5ac10d81 100755 --- a/app/demo/demo.c +++ b/app/demo/demo.c @@ -14,6 +14,9 @@ /*#* *#* $Log$ + *#* Revision 1.10 2007/09/29 16:30:37 bernie + *#* RASTER_SIZE(): Remove obsolete macro. + *#* *#* Revision 1.9 2006/09/20 14:29:34 marco *#* Add proc demo (not yet working). *#* @@ -82,14 +85,14 @@ static void magic(struct Bitmap *bitmap, coord_t x, coord_t y) gfx_lineTo(bitmap, coords[i]/2 + x, coords[i+1]/3 + y); } -void hello_world(Bitmap *bm) +static void hello_world(Bitmap *bm) { + extern const Font font_ncenB18; const Font *old_font = bm->font; gfx_bitmapClear(bm); /* Set big font */ - extern const Font font_ncenB18; gfx_setFont(bm, &font_ncenB18); text_xprintf(bm, 1, 0, STYLEF_BOLD | TEXT_FILL | TEXT_CENTER, @@ -105,7 +108,7 @@ void hello_world(Bitmap *bm) /** * Show the splash screen */ -void bouncing_logo(Bitmap *bm) +static void bouncing_logo(Bitmap *bm) { const long SPEED_SCALE = 1000; const long GRAVITY_ACCEL = 10; @@ -148,8 +151,8 @@ void win_demo(Bitmap *bm) Window root_win, small_win, large_win; Bitmap small_bm, large_bm; - uint8_t small_raster[RASTER_SIZE(small_width, small_height)]; - uint8_t large_raster[RASTER_SIZE(large_width, large_height)]; + uint8_t small_raster[RAST_SIZE(small_width, small_height)]; + uint8_t large_raster[RAST_SIZE(large_width, large_height)]; win_create(&root_win, bm); diff --git a/gfx/bitmap.c b/gfx/bitmap.c index fd534375..b7ed197c 100755 --- a/gfx/bitmap.c +++ b/gfx/bitmap.c @@ -6,54 +6,12 @@ * This file is part of DevLib - See README.devlib for information. * --> * - * \version $Id$ - * * \author Bernardo Innocenti * \author Stefano Fedrigo * * \brief Bitmap manipulation routines. */ -/*#* - *#* $Log$ - *#* Revision 1.12 2006/08/01 12:23:39 bernie - *#* gfx_setClipRect(): Also define when CONFIG_GFX_VCOORDS is enabled; Extend documentation. - *#* - *#* Revision 1.11 2006/07/19 12:56:26 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.10 2006/05/27 17:21:15 bernie - *#* Factor out, simplify and document clipping. - *#* - *#* Revision 1.9 2006/05/25 23:35:40 bernie - *#* Cleanup. - *#* - *#* Revision 1.8 2006/03/27 04:48:56 bernie - *#* gfx_blitImage(): New function; gfx_blitRaster(): Fix clipping bug. - *#* - *#* Revision 1.7 2006/03/07 22:18:04 bernie - *#* Correctly compute text width for prop fonts; Make styles a per-bitmap attribute. - *#* - *#* Revision 1.6 2006/02/23 11:17:16 bernie - *#* Documentation fixes. - *#* - *#* Revision 1.5 2006/02/15 09:10:15 bernie - *#* Implement prop fonts; Fix algo styles. - *#* - *#* Revision 1.4 2006/02/10 12:32:33 bernie - *#* Add multiple font support in bitmaps; gfx_blitRaster(): New function. - *#* - *#* Revision 1.3 2006/01/26 00:36:48 bernie - *#* Const correctness for some new functions. - *#* - *#* Revision 1.2 2006/01/24 21:55:43 aleph - *#* gfx_blit_P(): use RASTER_SIZE() to calculate raster size - *#* - *#* 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" @@ -111,7 +69,7 @@ void gfx_bitmapInit(Bitmap *bm, uint8_t *raster, coord_t w, coord_t h) */ void gfx_bitmapClear(Bitmap *bm) { - memset(bm->raster, 0, RASTER_SIZE(bm->width, bm->height)); + memset(bm->raster, 0, RAST_SIZE(bm->width, bm->height)); } @@ -127,7 +85,7 @@ void gfx_bitmapClear(Bitmap *bm) */ void gfx_blit_P(Bitmap *bm, const pgm_uint8_t *raster) { - memcpy_P(bm->raster, raster, RASTER_SIZE(bm->width, bm->height)); + memcpy_P(bm->raster, raster, RAST_SIZE(bm->width, bm->height)); } #endif /* CPU_HARVARD */ diff --git a/gfx/gfx.h b/gfx/gfx.h index 2c48b27b..ef4588fc 100755 --- a/gfx/gfx.h +++ b/gfx/gfx.h @@ -12,51 +12,6 @@ * \brief General pourpose graphics routines */ -/*#* - *#* $Log$ - *#* Revision 1.18 2006/08/01 12:45:01 bernie - *#* Remove Bitmap::cr when not needed. - *#* - *#* Revision 1.17 2006/07/19 12:56:26 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.16 2006/05/27 17:17:34 bernie - *#* Optimize away divisions in RAST_ADDR/MASK macros. - *#* - *#* Revision 1.15 2006/05/25 23:35:40 bernie - *#* Cleanup. - *#* - *#* Revision 1.14 2006/04/27 05:39:24 bernie - *#* Enhance text rendering to arbitrary x,y coords. - *#* - *#* Revision 1.13 2006/04/11 00:08:24 bernie - *#* text_offset(): New function, but I'm not quite confident with the design. - *#* - *#* Revision 1.12 2006/03/27 04:48:56 bernie - *#* gfx_blitImage(): New function; gfx_blitRaster(): Fix clipping bug. - *#* - *#* Revision 1.11 2006/03/07 22:18:04 bernie - *#* Correctly compute text width for prop fonts; Make styles a per-bitmap attribute. - *#* - *#* Revision 1.10 2006/02/17 22:24:40 bernie - *#* Fix undefined preprocessor symbol. - *#* - *#* Revision 1.9 2006/02/15 09:10:15 bernie - *#* Implement prop fonts; Fix algo styles. - *#* - *#* Revision 1.8 2006/02/10 12:28:33 bernie - *#* Add font support in bitmaps; Make bitmap formats public. - *#* - *#* Revision 1.7 2006/01/26 00:36:48 bernie - *#* Const correctness for some new functions. - *#* - *#* Revision 1.6 2006/01/23 23:13:04 bernie - *#* RECT_WIDTH(), RECT_HEIGHT(), RASTER_SIZE(): New macros. - *#* - *#* Revision 1.5 2006/01/17 02:31:29 bernie - *#* Add bitmap format support; Improve some comments. - *#*/ - #ifndef GFX_GFX_H #define GFX_GFX_H @@ -210,8 +165,6 @@ typedef struct Image #error Unknown value of CONFIG_BITMAP_FMT #endif /* CONFIG_BITMAP_FMT */ -#define RASTER_SIZE RAST_SIZE /* OBSOLETE */ - /* Function prototypes */ void gfx_bitmapInit (Bitmap *bm, uint8_t *raster, coord_t w, coord_t h); void gfx_bitmapClear(Bitmap *bm);