diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-05-10 17:12:00 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-05-10 17:12:00 +1000 |
| commit | 1a09f151e2b8998af522db463780d5bf7e50ca89 (patch) | |
| tree | 55ae0e5575595b5f7364e9caf93e0d0dc5795d38 /src/gdisp/gdisp_driver.h | |
| parent | 42d34fd421db06cb3388edd72cb7ca8d0f29feb0 (diff) | |
| download | uGFX-1a09f151e2b8998af522db463780d5bf7e50ca89.tar.gz uGFX-1a09f151e2b8998af522db463780d5bf7e50ca89.tar.bz2 uGFX-1a09f151e2b8998af522db463780d5bf7e50ca89.zip | |
Fix to LLD driver color conversions.
Diffstat (limited to 'src/gdisp/gdisp_driver.h')
| -rw-r--r-- | src/gdisp/gdisp_driver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gdisp/gdisp_driver.h b/src/gdisp/gdisp_driver.h index 7c4cafe8..a6983793 100644 --- a/src/gdisp/gdisp_driver.h +++ b/src/gdisp/gdisp_driver.h @@ -872,7 +872,7 @@ typedef struct GDISPVMT { #define LLDRGB2COLOR_G(g) (((LLDCOLOR_TYPE)((g) & (0xFF & ~((1<<(8-LLDCOLOR_BITS_G))-1)))) << (LLDCOLOR_BITS_G+LLDCOLOR_SHIFT_G-8)) #else // LLDCOLOR_BITS_G + LLDCOLOR_SHIFT_G < 8 #define LLDGREEN_OF(c) (((c) & (((1<<LLDCOLOR_BITS_G)-1) << LLDCOLOR_SHIFT_G)) << (8-(LLDCOLOR_BITS_G+LLDCOLOR_SHIFT_G))) - #define LLDRGB2COLOR_G(g) (((LLDCOLOR_TYPE)((g) & (0xFF & ~((1<<(8-LLDCOLOR_BITS_G))-1)))) >> (8-(LLDCOLOR_BITS_LLDG+COLOR_SHIFT_G))) + #define LLDRGB2COLOR_G(g) (((LLDCOLOR_TYPE)((g) & (0xFF & ~((1<<(8-LLDCOLOR_BITS_G))-1)))) >> (8-(LLDCOLOR_BITS_G+LLDCOLOR_SHIFT_G))) #endif #if LLDCOLOR_BITS_B + LLDCOLOR_SHIFT_B == 8 #define LLDBLUE_OF(c) ((c) & (((1<<LLDCOLOR_BITS_B)-1) << LLDCOLOR_SHIFT_B)) @@ -882,7 +882,7 @@ typedef struct GDISPVMT { #define LLDRGB2COLOR_B(b) (((LLDCOLOR_TYPE)((b) & (0xFF & ~((1<<(8-LLDCOLOR_BITS_B))-1)))) << (LLDCOLOR_BITS_B+LLDCOLOR_SHIFT_B-8)) #else // LLDCOLOR_BITS_B + LLDCOLOR_SHIFT_B < 8 #define LLDBLUE_OF(c) (((c) & (((1<<LLDCOLOR_BITS_B)-1) << LLDCOLOR_SHIFT_B)) << (8-(LLDCOLOR_BITS_B+LLDCOLOR_SHIFT_B))) - #define LLDRGB2COLOR_B(b) (((COLOR_TYPE)((b) & (0xFF & ~((1<<(8-LLDCOLOR_BITS_B))-1)))) >> (8-(LLDCOLOR_BITS_B+LLDCOLOR_SHIFT_B))) + #define LLDRGB2COLOR_B(b) (((LLDCOLOR_TYPE)((b) & (0xFF & ~((1<<(8-LLDCOLOR_BITS_B))-1)))) >> (8-(LLDCOLOR_BITS_B+LLDCOLOR_SHIFT_B))) #endif #define LLDLUMA_OF(c) ((LLDRED_OF(c)+((uint16_t)LLDGREEN_OF(c)<<1)+LLDBLUE_OF(c))>>2) #define LLDEXACT_RED_OF(c) (((uint16_t)(((c)>>LLDCOLOR_SHIFT_R)&((1<<LLDCOLOR_BITS_R)-1))*255)/((1<<LLDCOLOR_BITS_R)-1)) |