projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the TWI driver more generic to work with devices other than EEPROMS.
[bertos.git]
/
gfx
/
gfx_p.h
diff --git
a/gfx/gfx_p.h
b/gfx/gfx_p.h
index 5afc26e4321de175bf1d494293b5f4805b534752..101eb12c89ae85cc39f84498c183e6c7fc8ff0d1 100755
(executable)
--- a/
gfx/gfx_p.h
+++ b/
gfx/gfx_p.h
@@
-15,6
+15,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* 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.1 2006/01/26 00:32:49 bernie
*#* Graphics private header.
*#*
*#* Revision 1.1 2006/01/26 00:32:49 bernie
*#* Graphics private header.
*#*
@@
-23,24
+29,24
@@
#ifndef GFX_GFX_P_H
#define GFX_GFX_P_H
#ifndef GFX_GFX_P_H
#define GFX_GFX_P_H
-/**
- * \name Known pixel formats for bitmap representation.
- * \{
- */
-#define BITMAP_FMT_PLANAR_H_MSB 1 /**< Planar pixels, horizontal bytes, MSB left. */
-#define BITMAP_FMT_PLANAR_V_LSB 2 /**< Planar pixels, vertical bytes, LSB top. */
-/* \} */
#if CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_H_MSB
#if CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_H_MSB
+ //TODO: Collapse with RAST_* macros
#define BM_ADDR(bm, x, y) ((bm)->raster + (y) * (bm)->stride + ((x) / 8))
#define BM_MASK(bm, x, y) (1 << (7 - (x) % 8))
#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
#define BM_ADDR(bm, x, y) ((bm)->raster + ((y) / 8) * (bm)->stride + (x))
#define BM_MASK(bm, x, y) (1 << ((y) % 8))
#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))
+ // FIXME: not the same format of bitmaps!
+ #define RAST_ADDR(raster, x, y, stride) ((raster) + (y) / 8 + (x) * (stride))
+ #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 */
@@
-88,5
+94,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 */