Commit 80912d07 authored by Bodmer's avatar Bodmer

Fix #2376

parent 8c83eb84
...@@ -223,11 +223,6 @@ void* TFT_eSprite::callocSprite(int16_t w, int16_t h, uint8_t frames) ...@@ -223,11 +223,6 @@ void* TFT_eSprite::callocSprite(int16_t w, int16_t h, uint8_t frames)
***************************************************************************************/ ***************************************************************************************/
void TFT_eSprite::createPalette(uint16_t colorMap[], uint8_t colors) void TFT_eSprite::createPalette(uint16_t colorMap[], uint8_t colors)
{ {
if (_colorMap != nullptr)
{
free(_colorMap);
}
if (colorMap == nullptr) if (colorMap == nullptr)
{ {
// Create a color map using the default FLASH map // Create a color map using the default FLASH map
...@@ -236,7 +231,7 @@ void TFT_eSprite::createPalette(uint16_t colorMap[], uint8_t colors) ...@@ -236,7 +231,7 @@ void TFT_eSprite::createPalette(uint16_t colorMap[], uint8_t colors)
} }
// Allocate and clear memory for 16 color map // Allocate and clear memory for 16 color map
_colorMap = (uint16_t *)calloc(16, sizeof(uint16_t)); if (_colorMap == nullptr) _colorMap = (uint16_t *)calloc(16, sizeof(uint16_t));
if (colors > 16) colors = 16; if (colors > 16) colors = 16;
...@@ -261,7 +256,7 @@ void TFT_eSprite::createPalette(const uint16_t colorMap[], uint8_t colors) ...@@ -261,7 +256,7 @@ void TFT_eSprite::createPalette(const uint16_t colorMap[], uint8_t colors)
} }
// Allocate and clear memory for 16 color map // Allocate and clear memory for 16 color map
_colorMap = (uint16_t *)calloc(16, sizeof(uint16_t)); if (_colorMap == nullptr) _colorMap = (uint16_t *)calloc(16, sizeof(uint16_t));
if (colors > 16) colors = 16; if (colors > 16) colors = 16;
...@@ -380,7 +375,7 @@ void TFT_eSprite::deleteSprite(void) ...@@ -380,7 +375,7 @@ void TFT_eSprite::deleteSprite(void)
if (_colorMap != nullptr) if (_colorMap != nullptr)
{ {
free(_colorMap); free(_colorMap);
_colorMap = nullptr; _colorMap = nullptr;
} }
if (_created) if (_created)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment