github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lv_draw_letter: fix coloe of pixelswith LV_OPA_COVER and LV_OPA_TRANSP

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-05-03 15:43:56 +02:00
parent 73ef86f9a9
commit f6c60b8204
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/lv_draw/lv_draw_basic.c
View File

@@ -290,10 +290,13 @@ void lv_draw_letter(const lv_point_t * pos_p, const lv_area_t * mask_p, const lv
lv_coord_t col, row; lv_coord_t col, row;
uint8_t col_bit; uint8_t col_bit;
uint8_t col_byte_cnt; uint8_t col_byte_cnt;
uint8_t width_byte_scr =
letter_w >> 3; /*Width in bytes (on the screen finally) (e.g. w = 11 -> 2 bytes wide)*/ /*Width in bytes (on the screen finally) (e.g. w = 11 -> 2 bytes wide)*/
uint8_t width_byte_scr = letter_w >> 3;
if(letter_w & 0x7) width_byte_scr++; if(letter_w & 0x7) width_byte_scr++;
uint8_t width_byte_bpp = (letter_w * bpp) >> 3; /*Letter width in byte. Real width in the font*/
/*Letter width in byte. Real width in the font*/
uint8_t width_byte_bpp = (letter_w * bpp) >> 3;
if((letter_w * bpp) & 0x7) width_byte_bpp++; if((letter_w * bpp) & 0x7) width_byte_bpp++;
/* Calculate the col/row start/end on the map*/ /* Calculate the col/row start/end on the map*/
@@ -332,12 +335,16 @@ void lv_draw_letter(const lv_point_t * pos_p, const lv_area_t * mask_p, const lv
(col + pos_x) - vdb->area.x1, (col + pos_x) - vdb->area.x1,
(row + pos_y) - vdb->area.y1, color, px_opa); (row + pos_y) - vdb->area.y1, color, px_opa);
} else { } else {
if(px_opa > LV_OPA_MAX) *vdb_buf_tmp = color;
else if(px_opa < LV_OPA_MIN) continue;
else {
#if LV_COLOR_SCREEN_TRANSP == 0 #if LV_COLOR_SCREEN_TRANSP == 0
*vdb_buf_tmp = lv_color_mix(color, *vdb_buf_tmp, px_opa); *vdb_buf_tmp = lv_color_mix(color, *vdb_buf_tmp, px_opa);
#else #else
*vdb_buf_tmp = *vdb_buf_tmp =
color_mix_2_alpha(*vdb_buf_tmp, (*vdb_buf_tmp).alpha, color, px_opa); color_mix_2_alpha(*vdb_buf_tmp, (*vdb_buf_tmp).alpha, color, px_opa);
#endif #endif
}
} }
} }