libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

fix draw_mono_bmp issue 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@963 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong@gmail.com 2010-09-26 22:59:05 +00:00
parent 74a97349d2
commit 9238dbb7bf
1 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
components/rtgui/common/dc.c
View File

@ -11,6 +11,7 @@
* Date Author Notes * Date Author Notes
* 2009-10-16 Bernard first version * 2009-10-16 Bernard first version
* 2010-09-20 richard modified rtgui_dc_draw_round_rect * 2010-09-20 richard modified rtgui_dc_draw_round_rect
* 2010-09-27 Bernard fix draw_mono_bmp issue
*/ */
#include <rtgui/dc.h> #include <rtgui/dc.h>
#include <rtgui/rtgui_system.h> #include <rtgui/rtgui_system.h>
@ -324,53 +325,27 @@ void rtgui_dc_draw_text (struct rtgui_dc* dc, const char* text, struct rtgui_rec
*/ */
void rtgui_dc_draw_mono_bmp(struct rtgui_dc* dc, int x, int y, int w, int h, const rt_uint8_t* data) void rtgui_dc_draw_mono_bmp(struct rtgui_dc* dc, int x, int y, int w, int h, const rt_uint8_t* data)
{ {
int word_bytes;
int i, j, k; int i, j, k;
/* get word bytes */ /* get word bytes */
word_bytes = (w + 7)/8; w = (w + 7)/8;
/* draw mono bitmap data */ /* draw mono bitmap data */
for (i = 0; i < h; i ++) for (i = 0; i < h; i ++)
for (j = 0; j < word_bytes; j++) for (j = 0; j < w; j++)
for (k = 0; k < 8; k++) for (k = 0; k < 8; k++)
if ( ((data[i*2 + j] >> (7-k)) & 0x01) != 0) if ( ((data[i*w + j] >> (7-k)) & 0x01) != 0)
rtgui_dc_draw_point(dc, x + 8*j + k, y + i); rtgui_dc_draw_point(dc, x + 8*j + k, y + i);
} }
void rtgui_dc_draw_byte(struct rtgui_dc*dc, int x, int y, int h, const rt_uint8_t* data) void rtgui_dc_draw_byte(struct rtgui_dc*dc, int x, int y, int h, const rt_uint8_t* data)
{ {
int i, k; rtgui_dc_draw_mono_bmp(dc, x, y, 8, h, data);
/* draw byte */
for (i=0; i < h; i ++)
{
for (k=0; k < 8; k++)
{
if (((data[i] >> (7-k)) & 0x01) != 0)
{
rtgui_dc_draw_point(dc, x + k, y + i);
}
}
}
} }
void rtgui_dc_draw_word(struct rtgui_dc*dc, int x, int y, int h, const rt_uint8_t* data) void rtgui_dc_draw_word(struct rtgui_dc*dc, int x, int y, int h, const rt_uint8_t* data)
{ {
int i, j, k; rtgui_dc_draw_mono_bmp(dc, x, y, 16, h, data);
/* draw word */
for (i=0; i < h; i ++)
{
for (j=0; j < 2; j++)
for (k=0; k < 8; k++)
{
if (((data[i * 2 + j] >> (7-k)) & 0x01) != 0)
{
rtgui_dc_draw_point(dc, x + 8*j + k, y + i);
}
}
}
} }
void rtgui_dc_draw_border(struct rtgui_dc* dc, rtgui_rect_t* rect, int flag) void rtgui_dc_draw_border(struct rtgui_dc* dc, rtgui_rect_t* rect, int flag)