diff --git a/Extensions/Sprite.cpp b/Extensions/Sprite.cpp index 60ca2c7..2fb1f92 100644 --- a/Extensions/Sprite.cpp +++ b/Extensions/Sprite.cpp @@ -2618,7 +2618,7 @@ void TFT_eSprite::printToSprite(std::string_view string) ** Function name: printToSprite ** Description: Write a string to the sprite cursor position ***************************************************************************************/ -void TFT_eSprite::printToSprite(char *cbuffer, uint16_t len) //std::string_view string) +void TFT_eSprite::printToSprite(const char *cbuffer, uint16_t len) //std::string_view string) { if(!fontLoaded) return; diff --git a/Extensions/Sprite.h b/Extensions/Sprite.h index 1f6038d..cd19535 100644 --- a/Extensions/Sprite.h +++ b/Extensions/Sprite.h @@ -144,6 +144,7 @@ class TFT_eSprite : public TFT_eSPI { // Print string to sprite using loaded font at cursor position void printToSprite(std::string_view string); // Print indexed glyph to sprite using loaded font at x,y + void printToSprite(const char *cbuffer, uint16_t len); int16_t printToSprite(int16_t x, int16_t y, uint16_t index); private: diff --git a/Processors/TFT_eSPI_ESP32.h b/Processors/TFT_eSPI_ESP32.h index 3aae24f..fc79af9 100644 --- a/Processors/TFT_eSPI_ESP32.h +++ b/Processors/TFT_eSPI_ESP32.h @@ -135,9 +135,9 @@ SPI3_HOST = 2 #ifdef SMOOTH_FONT // Call up the SPIFFS (SPI FLASH Filing System) for the anti-aliased fonts #define FS_NO_GLOBALS - #include - #include "SPIFFS.h" // ESP32 only - #define FONT_FS_AVAILABLE + //#include + //#include "SPIFFS.h" // ESP32 only + //#define FONT_FS_AVAILABLE #endif //////////////////////////////////////////////////////////////////////////////////////// diff --git a/TFT_eSPI.cpp b/TFT_eSPI.cpp index 311739f..f22d5ed 100644 --- a/TFT_eSPI.cpp +++ b/TFT_eSPI.cpp @@ -5041,7 +5041,7 @@ int16_t TFT_eSPI::drawString(std::string_view string, int32_t poX, int32_t poY, if (padX && !_fillbg) _fillbg = true; while (n < len) { - uint16_t uniCode = decodeUTF8((uint8_t*)ptr, &n, len - n); + uint16_t uniCode = decodeUTF8((const uint8_t*)std::begin(string), &n, len - n); drawGlyph(uniCode); } _fillbg = fillbg; // restore state