libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix dc_buffer issue 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@676 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong 2010-04-28 10:08:14 +00:00
parent c2b29a3e31
commit e2e93e7251
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/rtgui/common/dc_buffer.c
View File

@ -24,12 +24,6 @@ struct rtgui_dc_buffer
/* graphic context */ /* graphic context */
rtgui_gc_t gc; rtgui_gc_t gc;
/* color and font */
rtgui_color_t color;
struct rtgui_font* font;
/* text align */
rt_int32_t align;
/* width and height */ /* width and height */
rt_uint16_t width, height; rt_uint16_t width, height;
rt_uint16_t pitch; rt_uint16_t pitch;
@ -84,9 +78,10 @@ struct rtgui_dc* rtgui_dc_buffer_create(int w, int h)
dc = (struct rtgui_dc_buffer*)rtgui_malloc(sizeof(struct rtgui_dc_buffer)); dc = (struct rtgui_dc_buffer*)rtgui_malloc(sizeof(struct rtgui_dc_buffer));
rtgui_dc_buffer_init(dc); rtgui_dc_buffer_init(dc);
dc->color = 0; dc->gc.foreground = default_foreground;
dc->font = RT_NULL; dc->gc.background = default_background;
dc->align = 0; dc->gc.font = rtgui_font_default();
dc->gc.textalign = RTGUI_ALIGN_LEFT | RTGUI_ALIGN_TOP;
dc->width = w; dc->width = w;
dc->height = h; dc->height = h;
@ -132,7 +127,7 @@ static void rtgui_dc_buffer_draw_point(struct rtgui_dc* self, int x, int y)
/* note: there is no parameter check in this function */ /* note: there is no parameter check in this function */
ptr = (rtgui_color_t*)(dc->pixel + y * dc->pitch + x * sizeof(rtgui_color_t)); ptr = (rtgui_color_t*)(dc->pixel + y * dc->pitch + x * sizeof(rtgui_color_t));
*ptr = dc->color; *ptr = dc->gc.foreground;
} }
static void rtgui_dc_buffer_draw_color_point(struct rtgui_dc* self, int x, int y, rtgui_color_t color) static void rtgui_dc_buffer_draw_color_point(struct rtgui_dc* self, int x, int y, rtgui_color_t color)
@ -164,7 +159,7 @@ static void rtgui_dc_buffer_draw_vline(struct rtgui_dc* self, int x, int y1, int
for (index = y1; index < y2; index ++) for (index = y1; index < y2; index ++)
{ {
/* draw this point */ /* draw this point */
*ptr = dc->color; *ptr = dc->gc.foreground;
ptr += dc->width; ptr += dc->width;
} }
} }
@ -184,7 +179,7 @@ static void rtgui_dc_buffer_draw_hline(struct rtgui_dc* self, int x1, int x2, in
for (index = x1; index < x2; index ++) for (index = x1; index < x2; index ++)
{ {
/* draw this point */ /* draw this point */
*ptr++ = dc->color; *ptr++ = dc->gc.foreground;
} }
} }