projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify schematic :)
[bertos.git]
/
gfx
/
gfx_p.h
diff --git
a/gfx/gfx_p.h
b/gfx/gfx_p.h
index 8482d8e6bd91baa333af0c5a91bf4e923eb8e6fb..0df757187da4955bc47121800db47500d81eeb71 100755
(executable)
--- a/
gfx/gfx_p.h
+++ b/
gfx/gfx_p.h
@@
-15,6
+15,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.4 2006/03/22 09:50:37 bernie
+ *#* Use the same format for fonts and rasters.
+ *#*
+ *#* Revision 1.3 2006/02/15 09:10:15 bernie
+ *#* Implement prop fonts; Fix algo styles.
+ *#*
*#* Revision 1.2 2006/02/10 12:28:33 bernie
*#* Add font support in bitmaps; Make bitmap formats public.
*#*
*#* Revision 1.2 2006/02/10 12:28:33 bernie
*#* Add font support in bitmaps; Make bitmap formats public.
*#*
@@
-29,18
+35,20
@@
#if CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_H_MSB
#if CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_H_MSB
- #define
BM_ADDR(bm, x, y) ((bm)->raster + (y) * (bm)->stride + ((x) / 8)
)
- #define
BM_MASK(bm, x, y)
(1 << (7 - (x) % 8))
+ #define
RAST_ADDR(raster, x, y, stride) ((raster) + (y) * (stride) + (x) / 8
)
+ #define
RAST_MASK(raster, x, y)
(1 << (7 - (x) % 8))
#elif CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_V_LSB
#elif CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_V_LSB
- #define BM_ADDR(bm, x, y) ((bm)->raster + ((y) / 8) * (bm)->stride + (x))
- #define BM_MASK(bm, x, y) (1 << ((y) % 8))
-
+ #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 */
#else
#error Unknown value of CONFIG_BITMAP_FMT
#endif /* CONFIG_BITMAP_FMT */
+#define BM_ADDR(bm, x, y) RAST_ADDR((bm)->raster, (x), (y), (bm)->stride)
+#define BM_MASK(bm, x, y) RAST_MASK((bm)->raster, (x), (y))
+
/*!
* Plot a pixel in bitmap \a bm.
*
/*!
* Plot a pixel in bitmap \a bm.
*
@@
-84,5
+92,7
@@
#define BM_READPIXEL(bm, x, y) \
( *BM_ADDR(bm, x, y) & BM_MASK(bm, x, y) ? 1 : 0 )
#define BM_READPIXEL(bm, x, y) \
( *BM_ADDR(bm, x, y) & BM_MASK(bm, x, y) ? 1 : 0 )
+#define RAST_READPIXEL(raster, x, y, stride) \
+ ( *RAST_ADDR(raster, x, y, stride) & RAST_MASK(raster, x, y) ? 1 : 0 )
#endif /* GFX_GFX_P_H */
#endif /* GFX_GFX_P_H */