Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

img rotate and canvas blur fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-11-06 16:16:55 +01:00
parent 37743ba8a2
commit 641ab62f42
2 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lv_draw/lv_img_buf.c
View File

@ -553,8 +553,8 @@ bool lv_img_buf_get_px_rotated(lv_img_rotate_dsc_t * dsc, lv_coord_t x, lv_coord
} else { } else {
px = 0; /*unused*/ px = 0; /*unused*/
px_size = 0; /*unused*/ px_size = 0; /*unused*/
c_dest_int = lv_img_buf_get_px_color(&dsc->img_dsc, x, y, dsc->color, false); c_dest_int = lv_img_buf_get_px_color(&dsc->img_dsc, xs_int, ys_int, dsc->color, false);
opa_dest_int = lv_img_buf_get_px_alpha(&dsc->img_dsc, x, y, false); opa_dest_int = lv_img_buf_get_px_alpha(&dsc->img_dsc, xs_int, ys_int, false);
} }
@ -584,8 +584,8 @@ bool lv_img_buf_get_px_rotated(lv_img_rotate_dsc_t * dsc, lv_coord_t x, lv_coord
memcpy(&c_dest_xn, &src_u8[px - px_size], sizeof(lv_color_t)); memcpy(&c_dest_xn, &src_u8[px - px_size], sizeof(lv_color_t));
if(dsc->has_alpha) opa_dest_xn = src_u8[px - 1]; if(dsc->has_alpha) opa_dest_xn = src_u8[px - 1];
} else { } else {
c_dest_xn = lv_img_buf_get_px_color(&dsc->img_dsc, xn, y, dsc->color, false); c_dest_xn = lv_img_buf_get_px_color(&dsc->img_dsc, xn, ys_int, dsc->color, false);
if(dsc->has_alpha) opa_dest_xn = lv_img_buf_get_px_alpha(&dsc->img_dsc, xn, y, false); if(dsc->has_alpha) opa_dest_xn = lv_img_buf_get_px_alpha(&dsc->img_dsc, xn, ys_int, false);
} }
c_x_dest = lv_color_mix(c_dest_int, c_dest_xn, xr); c_x_dest = lv_color_mix(c_dest_int, c_dest_xn, xr);
@ -601,8 +601,8 @@ bool lv_img_buf_get_px_rotated(lv_img_rotate_dsc_t * dsc, lv_coord_t x, lv_coord
memcpy(&c_dest_xn, &src_u8[px + px_size], sizeof(lv_color_t)); memcpy(&c_dest_xn, &src_u8[px + px_size], sizeof(lv_color_t));
if(dsc->has_alpha) opa_dest_xn = src_u8[px + 2 * px_size - 1]; if(dsc->has_alpha) opa_dest_xn = src_u8[px + 2 * px_size - 1];
} else { } else {
c_dest_xn = lv_img_buf_get_px_color(&dsc->img_dsc, xn, y, dsc->color, false); c_dest_xn = lv_img_buf_get_px_color(&dsc->img_dsc, xn, ys_int, dsc->color, false);
if(dsc->has_alpha) opa_dest_xn = lv_img_buf_get_px_alpha(&dsc->img_dsc, xn, y, false); if(dsc->has_alpha) opa_dest_xn = lv_img_buf_get_px_alpha(&dsc->img_dsc, xn, ys_int, false);
} }
c_x_dest = lv_color_mix(c_dest_int, c_dest_xn, xr); c_x_dest = lv_color_mix(c_dest_int, c_dest_xn, xr);
@ -629,8 +629,8 @@ bool lv_img_buf_get_px_rotated(lv_img_rotate_dsc_t * dsc, lv_coord_t x, lv_coord
memcpy(&c_dest_yn, &src_u8[px - px_size * dsc->src_w], sizeof(lv_color_t)); memcpy(&c_dest_yn, &src_u8[px - px_size * dsc->src_w], sizeof(lv_color_t));
if(dsc->has_alpha) opa_dest_yn = src_u8[px - px_size * dsc->src_w + px_size- 1]; if(dsc->has_alpha) opa_dest_yn = src_u8[px - px_size * dsc->src_w + px_size- 1];
} else { } else {
c_dest_yn = lv_img_buf_get_px_color(&dsc->img_dsc, yn, y, dsc->color, false); c_dest_yn = lv_img_buf_get_px_color(&dsc->img_dsc, xs_int, yn, dsc->color, false);
if(dsc->has_alpha) opa_dest_yn = lv_img_buf_get_px_alpha(&dsc->img_dsc, yn, y, false); if(dsc->has_alpha) opa_dest_yn = lv_img_buf_get_px_alpha(&dsc->img_dsc, xs_int, yn, false);
} }
c_y_dest = lv_color_mix(c_dest_int, c_dest_yn, yr); c_y_dest = lv_color_mix(c_dest_int, c_dest_yn, yr);
@ -646,8 +646,8 @@ bool lv_img_buf_get_px_rotated(lv_img_rotate_dsc_t * dsc, lv_coord_t x, lv_coord
memcpy(&c_dest_yn, &src_u8[px + px_size * dsc->src_w], sizeof(lv_color_t)); memcpy(&c_dest_yn, &src_u8[px + px_size * dsc->src_w], sizeof(lv_color_t));
if(dsc->has_alpha) opa_dest_yn = src_u8[px + px_size * dsc->src_w + 2 * px_size - 1]; if(dsc->has_alpha) opa_dest_yn = src_u8[px + px_size * dsc->src_w + 2 * px_size - 1];
} else { } else {
c_dest_yn = lv_img_buf_get_px_color(&dsc->img_dsc, yn, y, dsc->color, false); c_dest_yn = lv_img_buf_get_px_color(&dsc->img_dsc, xs_int, yn, dsc->color, false);
if(dsc->has_alpha) opa_dest_yn = lv_img_buf_get_px_alpha(&dsc->img_dsc, yn, y, false); if(dsc->has_alpha) opa_dest_yn = lv_img_buf_get_px_alpha(&dsc->img_dsc, xs_int, yn, false);
} }
c_y_dest = lv_color_mix(c_dest_int, c_dest_yn, yr); c_y_dest = lv_color_mix(c_dest_int, c_dest_yn, yr);

39
src/lv_objx/lv_canvas.c
View File

@ -393,6 +393,8 @@ void lv_canvas_blur_hor(lv_obj_t * canvas, const lv_area_t * area, uint16_t r)
{ {
LV_ASSERT_OBJ(canvas, LV_OBJX_NAME); LV_ASSERT_OBJ(canvas, LV_OBJX_NAME);
if(r == 0) return;
lv_canvas_ext_t * ext = lv_obj_get_ext_attr(canvas); lv_canvas_ext_t * ext = lv_obj_get_ext_attr(canvas);
lv_area_t a; lv_area_t a;
@ -445,6 +447,7 @@ void lv_canvas_blur_hor(lv_obj_t * canvas, const lv_area_t * area, uint16_t r)
for(x = a.x1 -r_back; x <= a.x1 + r_front; x++) { for(x = a.x1 -r_back; x <= a.x1 + r_front; x++) {
x_safe = x < 0 ? 0 : x; x_safe = x < 0 ? 0 : x;
x_safe = x_safe > ext->dsc.header.w - 1 ? ext->dsc.header.w - 1 : x_safe;
c = lv_img_buf_get_px_color(&line_img, x_safe, 0, style->image.color, false); c = lv_img_buf_get_px_color(&line_img, x_safe, 0, style->image.color, false);
if(has_alpha) opa = lv_img_buf_get_px_alpha(&line_img, x_safe, 0, false); if(has_alpha) opa = lv_img_buf_get_px_alpha(&line_img, x_safe, 0, false);
@ -509,6 +512,8 @@ void lv_canvas_blur_hor(lv_obj_t * canvas, const lv_area_t * area, uint16_t r)
if(has_alpha) asum += opa; if(has_alpha) asum += opa;
} }
} }
lv_obj_invalidate(canvas);
lv_draw_buf_release(line_buf); lv_draw_buf_release(line_buf);
} }
@ -523,6 +528,8 @@ void lv_canvas_blur_ver(lv_obj_t * canvas, const lv_area_t * area, uint16_t r)
{ {
LV_ASSERT_OBJ(canvas, LV_OBJX_NAME); LV_ASSERT_OBJ(canvas, LV_OBJX_NAME);
if(r == 0) return;
lv_canvas_ext_t * ext = lv_obj_get_ext_attr(canvas); lv_canvas_ext_t * ext = lv_obj_get_ext_attr(canvas);
lv_area_t a; lv_area_t a;
@ -572,6 +579,7 @@ void lv_canvas_blur_ver(lv_obj_t * canvas, const lv_area_t * area, uint16_t r)
for(y = a.y1 -r_back; y <= a.y1 + r_front; y++) { for(y = a.y1 -r_back; y <= a.y1 + r_front; y++) {
y_safe = y < 0 ? 0 : y; y_safe = y < 0 ? 0 : y;
y_safe = y_safe > ext->dsc.header.h - 1 ? ext->dsc.header.h - 1 : y_safe;
c = lv_img_buf_get_px_color(&ext->dsc, x, y_safe, style->image.color, false); c = lv_img_buf_get_px_color(&ext->dsc, x, y_safe, style->image.color, false);
if(has_alpha) opa = lv_img_buf_get_px_alpha(&ext->dsc, x, y_safe, false); if(has_alpha) opa = lv_img_buf_get_px_alpha(&ext->dsc, x, y_safe, false);
@ -643,6 +651,8 @@ void lv_canvas_blur_ver(lv_obj_t * canvas, const lv_area_t * area, uint16_t r)
} }
} }
lv_obj_invalidate(canvas);
lv_draw_buf_release(col_buf); lv_draw_buf_release(col_buf);
} }
@ -683,6 +693,11 @@ void lv_canvas_draw_rect(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, lv_coord
lv_img_dsc_t * dsc = lv_canvas_get_img(canvas); lv_img_dsc_t * dsc = lv_canvas_get_img(canvas);
if(dsc->header.cf >= LV_IMG_CF_INDEXED_1BIT && dsc->header.cf <= LV_IMG_CF_INDEXED_8BIT) {
LV_LOG_WARN("lv_canvas_draw_rect: can't raw to LV_IMG_CF_INDEXED canvas");
return;
}
/* Create a dummy display to fool the lv_draw function. /* Create a dummy display to fool the lv_draw function.
* It will think it draws to real screen. */ * It will think it draws to real screen. */
lv_area_t mask; lv_area_t mask;
@ -750,6 +765,11 @@ void lv_canvas_draw_text(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, lv_coord
lv_img_dsc_t * dsc = lv_canvas_get_img(canvas); lv_img_dsc_t * dsc = lv_canvas_get_img(canvas);
if(dsc->header.cf >= LV_IMG_CF_INDEXED_1BIT && dsc->header.cf <= LV_IMG_CF_INDEXED_8BIT) {
LV_LOG_WARN("lv_canvas_draw_text: can't raw to LV_IMG_CF_INDEXED canvas");
return;
}
/* Create a dummy display to fool the lv_draw function. /* Create a dummy display to fool the lv_draw function.
* It will think it draws to real screen. */ * It will think it draws to real screen. */
lv_area_t mask; lv_area_t mask;
@ -808,6 +828,11 @@ void lv_canvas_draw_img(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, const voi
lv_img_dsc_t * dsc = lv_canvas_get_img(canvas); lv_img_dsc_t * dsc = lv_canvas_get_img(canvas);
if(dsc->header.cf >= LV_IMG_CF_INDEXED_1BIT && dsc->header.cf <= LV_IMG_CF_INDEXED_8BIT) {
LV_LOG_WARN("lv_canvas_draw_img: can't raw to LV_IMG_CF_INDEXED canvas");
return;
}
/* Create a dummy display to fool the lv_draw function. /* Create a dummy display to fool the lv_draw function.
* It will think it draws to real screen. */ * It will think it draws to real screen. */
lv_area_t mask; lv_area_t mask;
@ -866,6 +891,10 @@ void lv_canvas_draw_line(lv_obj_t * canvas, const lv_point_t * points, uint32_t
lv_img_dsc_t * dsc = lv_canvas_get_img(canvas); lv_img_dsc_t * dsc = lv_canvas_get_img(canvas);
if(dsc->header.cf >= LV_IMG_CF_INDEXED_1BIT && dsc->header.cf <= LV_IMG_CF_INDEXED_8BIT) {
LV_LOG_WARN("lv_canvas_draw_line: can't raw to LV_IMG_CF_INDEXED canvas");
return;
}
/* Create a dummy display to fool the lv_draw function. /* Create a dummy display to fool the lv_draw function.
* It will think it draws to real screen. */ * It will think it draws to real screen. */
lv_area_t mask; lv_area_t mask;
@ -951,6 +980,11 @@ void lv_canvas_draw_polygon(lv_obj_t * canvas, const lv_point_t * points, uint32
lv_img_dsc_t * dsc = lv_canvas_get_img(canvas); lv_img_dsc_t * dsc = lv_canvas_get_img(canvas);
if(dsc->header.cf >= LV_IMG_CF_INDEXED_1BIT && dsc->header.cf <= LV_IMG_CF_INDEXED_8BIT) {
LV_LOG_WARN("lv_canvas_draw_polygon: can't raw to LV_IMG_CF_INDEXED canvas");
return;
}
/* Create a dummy display to fool the lv_draw function. /* Create a dummy display to fool the lv_draw function.
* It will think it draws to real screen. */ * It will think it draws to real screen. */
lv_area_t mask; lv_area_t mask;
@ -1011,6 +1045,11 @@ void lv_canvas_draw_arc(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, lv_coord_
lv_img_dsc_t * dsc = lv_canvas_get_img(canvas); lv_img_dsc_t * dsc = lv_canvas_get_img(canvas);
if(dsc->header.cf >= LV_IMG_CF_INDEXED_1BIT && dsc->header.cf <= LV_IMG_CF_INDEXED_8BIT) {
LV_LOG_WARN("lv_canvas_draw_arc: can't raw to LV_IMG_CF_INDEXED canvas");
return;
}
/* Create a dummy display to fool the lv_draw function. /* Create a dummy display to fool the lv_draw function.
* It will think it draws to real screen. */ * It will think it draws to real screen. */
lv_area_t mask; lv_area_t mask;