diff options
| author | Gabor Kiss-Vamosi <kisvegabor@gmail.com> | 2022-07-19 17:21:19 +0200 |
|---|---|---|
| committer | Gabor Kiss-Vamosi <kisvegabor@gmail.com> | 2022-07-19 17:21:19 +0200 |
| commit | 61048554914eee36630f492ebe4e4742b51fa2c1 (patch) | |
| tree | 9fd4306de62eff85ab9cd62b2596675853be8390 /src/widgets/lv_canvas.c | |
| parent | 09301a0970717752e3503fad9db4f54ffadb715d (diff) | |
| download | lvgl-61048554914eee36630f492ebe4e4742b51fa2c1.tar.gz lvgl-61048554914eee36630f492ebe4e4742b51fa2c1.zip | |
fix(conf): fix a lot of new config realted issues
Diffstat (limited to 'src/widgets/lv_canvas.c')
| -rw-r--r-- | src/widgets/lv_canvas.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/widgets/lv_canvas.c b/src/widgets/lv_canvas.c index afa905f0e..fa3945984 100644 --- a/src/widgets/lv_canvas.c +++ b/src/widgets/lv_canvas.c @@ -289,11 +289,7 @@ void lv_canvas_blur_hor(lv_obj_t * obj, const lv_area_t * area, uint16_t r) if(has_alpha) opa = lv_img_buf_get_px_alpha(&line_img, x_safe, 0); rsum += c.ch.red; -#if LV_COLOR_DEPTH == 16 && LV_COLOR_16_SWAP - gsum += (c.ch.green_h << 3) + c.ch.green_l; -#else gsum += c.ch.green; -#endif bsum += c.ch.blue; if(has_alpha) asum += opa; } @@ -305,13 +301,7 @@ void lv_canvas_blur_hor(lv_obj_t * obj, const lv_area_t * area, uint16_t r) if(asum) { c.ch.red = rsum / r; -#if LV_COLOR_DEPTH == 16 && LV_COLOR_16_SWAP - uint8_t gtmp = gsum / r; - c.ch.green_h = gtmp >> 3; - c.ch.green_l = gtmp & 0x7; -#else c.ch.green = gsum / r; -#endif c.ch.blue = bsum / r; if(has_alpha) opa = asum / r; @@ -325,11 +315,7 @@ void lv_canvas_blur_hor(lv_obj_t * obj, const lv_area_t * area, uint16_t r) if(has_alpha) opa = lv_img_buf_get_px_alpha(&line_img, x_safe, 0); rsum -= c.ch.red; -#if LV_COLOR_DEPTH == 16 && LV_COLOR_16_SWAP - gsum -= (c.ch.green_h << 3) + c.ch.green_l; -#else gsum -= c.ch.green; -#endif bsum -= c.ch.blue; if(has_alpha) asum -= opa; @@ -339,11 +325,7 @@ void lv_canvas_blur_hor(lv_obj_t * obj, const lv_area_t * area, uint16_t r) if(has_alpha) opa = lv_img_buf_get_px_alpha(&line_img, x_safe, 0); rsum += c.ch.red; -#if LV_COLOR_DEPTH == 16 && LV_COLOR_16_SWAP - gsum += (c.ch.green_h << 3) + c.ch.green_l; -#else gsum += c.ch.green; -#endif bsum += c.ch.blue; if(has_alpha) asum += opa; } @@ -418,11 +400,7 @@ void lv_canvas_blur_ver(lv_obj_t * obj, const lv_area_t * area, uint16_t r) if(has_alpha) lv_img_buf_set_px_alpha(&line_img, 0, y_safe, opa); rsum += c.ch.red; -#if LV_COLOR_DEPTH == 16 && LV_COLOR_16_SWAP - gsum += (c.ch.green_h << 3) + c.ch.green_l; -#else gsum += c.ch.green; -#endif bsum += c.ch.blue; if(has_alpha) asum += opa; } @@ -433,13 +411,7 @@ void lv_canvas_blur_ver(lv_obj_t * obj, const lv_area_t * area, uint16_t r) for(y = a.y1; y <= a.y2; y++) { if(asum) { c.ch.red = rsum / r; -#if LV_COLOR_DEPTH == 16 && LV_COLOR_16_SWAP - uint8_t gtmp = gsum / r; - c.ch.green_h = gtmp >> 3; - c.ch.green_l = gtmp & 0x7; -#else c.ch.green = gsum / r; -#endif c.ch.blue = bsum / r; if(has_alpha) opa = asum / r; @@ -453,11 +425,7 @@ void lv_canvas_blur_ver(lv_obj_t * obj, const lv_area_t * area, uint16_t r) if(has_alpha) opa = lv_img_buf_get_px_alpha(&line_img, 0, y_safe); rsum -= c.ch.red; -#if LV_COLOR_DEPTH == 16 && LV_COLOR_16_SWAP - gsum -= (c.ch.green_h << 3) + c.ch.green_l; -#else gsum -= c.ch.green; -#endif bsum -= c.ch.blue; if(has_alpha) asum -= opa; @@ -471,11 +439,7 @@ void lv_canvas_blur_ver(lv_obj_t * obj, const lv_area_t * area, uint16_t r) if(has_alpha) lv_img_buf_set_px_alpha(&line_img, 0, y_safe, opa); rsum += c.ch.red; -#if LV_COLOR_DEPTH == 16 && LV_COLOR_16_SWAP - gsum += (c.ch.green_h << 3) + c.ch.green_l; -#else gsum += c.ch.green; -#endif bsum += c.ch.blue; if(has_alpha) asum += opa; } |