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

Merge pull request #1258 from joltwallet/fix/lv_color_warning

Browse Source 
fix 1bit lv_color compilation warnings/errors introduced by ...
This commit is contained in:
Gabor Kiss-Vamosi
2019-11-11 13:07:43 +01:00
committed by GitHub
parent 8cf7824f82 57e2a6d983
commit 46eabd6cf0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lv_misc/lv_color.h
View File

@@ -392,10 +392,10 @@ static inline uint8_t lv_color_brightness(lv_color_t color)
/* The most simple macro to create a color from R,G and B values */ /* The most simple macro to create a color from R,G and B values */
#if LV_COLOR_DEPTH == 1 #if LV_COLOR_DEPTH == 1
#define LV_COLOR_MAKE(r8, g8, b8) ((lv_color_t){(b8 >> 7 | g8 >> 7 | r8 >> 7)}) #define LV_COLOR_MAKE(r8, g8, b8) ((lv_color_t){.full = (b8 >> 7 | g8 >> 7 | r8 >> 7)})
static inline lv_color_t lv_color_make(int r8, int g8, int b8) static inline lv_color_t lv_color_make(int r8, int g8, int b8)
{ {
lv_color_t color; lv_color_t color = { 0 };
color.full = (b8 >> 7 | g8 >> 7 | r8 >> 7); color.full = (b8 >> 7 | g8 >> 7 | r8 >> 7);
return color; return color;
} }