test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-29 18:48:09 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

optimize lcd_reg

Browse Source
This commit is contained in:
xianjimli 2018-03-31 18:41:33 +08:00
parent 27c715f359
commit 005d71db49
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demos/demo1_app.c
View File

@ -89,10 +89,10 @@ ret_t application_init() {
show_dialog = button_create(win, 190, 5, 80, 30);
widget_set_text(show_dialog, L"Dialog");
// image = image_create(win, 10, 230, 100, 100);
// image_set_image_name(image, "earth");
image = image_create(win, 10, 230, 100, 100);
image_set_image_name(image, "earth");
image = image_create(win, 100, 230, 100, 100);
image = image_create(win, 100, 230, 200, 200);
image_set_image_name(image, "earth");
image_set_draw_type(image, IMAGE_DRAW_SCALE);

31
src/lcd/lcd_reg.inc
View File

@ -112,6 +112,7 @@ static ret_t lcd_reg_draw_image(lcd_t* lcd, bitmap_t* img, rect_t* src, rect_t*
wh_t dw = dst->w;
wh_t dh = dst->h;
color_t fill_color = lcd->fill_color;
pixel_t fill_pixel = to_pixel(fill_color);
const color_t* data = (color_t*)img->data;
if (src->w == dst->w && src->h == dst->h) {
@ -123,8 +124,12 @@ static ret_t lcd_reg_draw_image(lcd_t* lcd, bitmap_t* img, rect_t* src, rect_t*
for (j = 0; j < dh; j++) {
for (i = 0; i < dw; i++) {
color_t src_color = src_p[i];
pixel_t color = blend_color(fill_color, src_color, src_color.rgba.a);
write_data_func(color);
if(src_color.rgba.a > 7) {
pixel_t color = src_color.rgba.a < 0xfe ? blend_color(fill_color, src_color, src_color.rgba.a) : to_pixel(src_color);
write_data_func(color);
} else {
write_data_func(fill_pixel);
}
}
src_p += img->w;
}
@ -134,18 +139,20 @@ static ret_t lcd_reg_draw_image(lcd_t* lcd, bitmap_t* img, rect_t* src, rect_t*
wh_t sw = src->w;
wh_t sh = src->h;
wh_t iw = img->w;
xy_t r = dst->x + dst->w;
xy_t b = dst->y + dst->h;
for (j = 0; j < dh; j++) {
for (i = 0; i < dw; i++) {
const color_t* src_p = data + iw * (sy + (j * sh / dh)) + sx + (i * sw) / dw;
color_t src_color = src_p[i];
pixel_t color = blend_color(fill_color, src_color, src_color.rgba.a);
for (j = 0, y = dst->y; y < b; j++, y++) {
const color_t* src_p = data + iw * (sy + (j * sh / dh)) + sx;
for (i = 0, x = dst->x; x < r; i++, x++) {
uint32_t s = (i * sw) / dw;
color_t src_color = src_p[s];
if(src_color.rgba.a > 7) {
pixel_t color = src_color.rgba.a < 0xfe ? blend_color(fill_color, src_color, src_color.rgba.a) : to_pixel(src_color);
x = dst->x + i;
y = dst->y + j;
set_window_func(x, y, x, y);
write_data_func(color);
set_window_func(x, y, x, y);
write_data_func(color);
}
}
}
}