From: bernie Date: Thu, 25 May 2006 23:35:40 +0000 (+0000) Subject: Cleanup. X-Git-Tag: 1.0.0~608 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=1661811803a323488afb5617a01a3263ecff9d9c;p=bertos.git Cleanup. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@633 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/gfx/bitmap.c b/gfx/bitmap.c index c9f1b83d..36bd24dd 100755 --- a/gfx/bitmap.c +++ b/gfx/bitmap.c @@ -16,6 +16,9 @@ /*#* *#* $Log$ + *#* 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. *#* @@ -95,6 +98,7 @@ void gfx_bitmapInit(Bitmap *bm, uint8_t *raster, coord_t w, coord_t h) * Clear the whole bitmap surface to the background color. * * \note This function does \b not update the current pen position. + * \note This function bypasses the current clipping area. */ void gfx_bitmapClear(Bitmap *bm) { diff --git a/gfx/gfx.h b/gfx/gfx.h index a165fd7e..be008f02 100755 --- a/gfx/gfx.h +++ b/gfx/gfx.h @@ -14,6 +14,9 @@ /*#* *#* $Log$ + *#* 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. *#* @@ -179,18 +182,19 @@ typedef struct Image * Compute the size in bytes of a raster suitable for * holding a bitmap of \a width x \a height pixels. */ - #define RASTER_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 /** * Compute the size in bytes of a raster suitable for * holding a bitmap of \a width x \a height pixels. */ - #define RASTER_SIZE(width, height) ( (width) * (((height) + 7) / 8) ) + #define RAST_SIZE(width, height) ( (width) * (((height) + 7) / 8) ) #else #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); diff --git a/gfx/gfx_p.h b/gfx/gfx_p.h index 0df75718..5b483ab1 100755 --- a/gfx/gfx_p.h +++ b/gfx/gfx_p.h @@ -15,6 +15,9 @@ /*#* *#* $Log$ + *#* Revision 1.5 2006/05/25 23:35:40 bernie + *#* Cleanup. + *#* *#* Revision 1.4 2006/03/22 09:50:37 bernie *#* Use the same format for fonts and rasters. *#* @@ -42,6 +45,7 @@ #define RAST_ADDR(raster, x, y, stride) ((raster) + ((y) / 8) * (stride) + (x)) #define RAST_MASK(raster, x, y) (1 << ((y) % 8)) + #else #error Unknown value of CONFIG_BITMAP_FMT #endif /* CONFIG_BITMAP_FMT */