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

merge dev-7.0

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-01-17 13:36:10 +01:00
parent 6e5e1ab154 8d71d87242
commit 6640585827
10 changed files with 177 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lv_draw/lv_draw_arc.c
View File

@@ -111,8 +111,8 @@ static void get_rounded_area(int16_t angle, lv_coord_t radius, uint8_t tickness,
const uint8_t ps = 8;
const uint8_t pa = 127;
lv_coord_t thick_half = tickness / 2;
lv_coord_t thick_corr = tickness & 0x01 ? 0 : 1;
int32_t thick_half = tickness / 2;
uint8_t thick_corr = tickness & 0x01 ? 0 : 1;
lv_coord_t rx_corr;
lv_coord_t ry_corr;
@@ -123,8 +123,8 @@ static void get_rounded_area(int16_t angle, lv_coord_t radius, uint8_t tickness,
if(angle > 0 && angle < 180) ry_corr = 0;
else ry_corr = 0;
lv_coord_t cir_x;
lv_coord_t cir_y;
int32_t cir_x;
int32_t cir_y;
cir_x = ((radius - rx_corr - thick_half) * lv_trigo_sin(90 - angle)) >> (LV_TRIGO_SHIFT - ps);
cir_y = ((radius - ry_corr - thick_half) * lv_trigo_sin(angle)) >> (LV_TRIGO_SHIFT - ps);