Bodmer/TFT_eSPI
1
0
Fork 1
mirror of https://github.com/Bodmer/TFT_eSPI.git synced 2025-08-04 05:04:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #745 from Bodmer/revert-741-fix/ambigous_pushSprite

Browse Source 
Revert "Resolve ambigous pushSprite(int int int) methods"
This commit is contained in:
Bodmer
2020-09-07 13:06:18 +01:00
committed by GitHub
parent 27657bcb9a 4c314c5c33
commit aaebc18844
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Extensions/Sprite.cpp
View File

@@ -739,22 +739,22 @@ void TFT_eSprite::pushSprite(int32_t x, int32_t y, uint16_t transp)
// 4bpp -> 4bpp (note: color translation depends on the 2 sprites pallet colors)
// 1bpp -> 1bpp (note: color translation depends on the 2 sprites bitmap colors)
bool TFT_eSprite::pushSprite(TFT_eSprite &spr, int32_t x, int32_t y)
bool TFT_eSprite::pushSprite(TFT_eSprite *spr, int32_t x, int32_t y)
{
if (!_created) return false;
if (!spr.created()) return false;
if (!spr->created()) return false;
// Check destination sprite compatibility
int8_t ds_bpp = spr.getColorDepth();
int8_t ds_bpp = spr->getColorDepth();
if (_bpp == 16 && ds_bpp != 16 && ds_bpp != 8) return false;
if (_bpp == 8) return false;
if (_bpp == 4 && ds_bpp != 4) return false;
if (_bpp == 1 && ds_bpp != 1) return false;
bool oldSwapBytes = spr.getSwapBytes();
spr.setSwapBytes(false);
spr.pushImage(x, y, _dwidth, _dheight, _img );
spr.setSwapBytes(oldSwapBytes);
bool oldSwapBytes = spr->getSwapBytes();
spr->setSwapBytes(false);
spr->pushImage(x, y, _dwidth, _dheight, _img );
spr->setSwapBytes(oldSwapBytes);
return true;
}

2
Extensions/Sprite.h
View File

@@ -135,7 +135,7 @@ class TFT_eSprite : public TFT_eSPI {
// Push the sprite to another sprite, this fn calls pushImage() in the destination sprite class.
// >>>>>> Using a transparent color is not supported at the moment <<<<<<
bool pushSprite(TFT_eSprite &spr, int32_t x, int32_t y);
bool pushSprite(TFT_eSprite *spr, int32_t x, int32_t y);
// Push a windowed area of the sprite to the TFT at tx, ty
bool pushSprite(int32_t tx, int32_t ty, int32_t sx, int32_t sy, int32_t sw, int32_t sh);