Bodmer/TFT_eSPI
1
0
Fork 1
mirror of https://github.com/Bodmer/TFT_eSPI.git synced 2025-07-30 18:57:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid compile error with Teensy

Browse Source 
Avoid error when alphaBlend function used in sketch
This commit is contained in:
Bodmer
2023-08-10 22:10:25 +01:00
parent 1986bd2423
commit 3fcadd2792
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TFT_eSPI.cpp
View File

@ -4973,8 +4973,8 @@ uint16_t TFT_eSPI::decodeUTF8(uint8_t *buf, uint16_t *index, uint16_t remaining)
** Function name: alphaBlend ** Function name: alphaBlend
** Description: Blend 16bit foreground and background ** Description: Blend 16bit foreground and background
*************************************************************************************x*/ *************************************************************************************x*/
#ifndef STM32 #if !defined (STM32) && !defined(__IMXRT1052__) && !defined(__IMXRT1062__)
inline inline
#endif #endif
uint16_t TFT_eSPI::alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc) uint16_t TFT_eSPI::alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc)
{ {

9
TFT_eSPI.h
View File

@ -732,12 +732,11 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac
// Alpha blend 2 colours, see generic "alphaBlend_Test" example // Alpha blend 2 colours, see generic "alphaBlend_Test" example
// alpha = 0 = 100% background colour // alpha = 0 = 100% background colour
// alpha = 255 = 100% foreground colour // alpha = 255 = 100% foreground colour
#ifdef STM32 #if !defined (STM32) && !defined(__IMXRT1052__) && !defined(__IMXRT1062__)
uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc); inline
#else
inline
uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc);
#endif #endif
uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc);
// 16 bit colour alphaBlend with alpha dither (dither reduces colour banding) // 16 bit colour alphaBlend with alpha dither (dither reduces colour banding)
uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc, uint8_t dither); uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc, uint8_t dither);
// 24 bit colour alphaBlend with optional alpha dither // 24 bit colour alphaBlend with optional alpha dither