diff --git a/lib/EpdFont/EpdFont.cpp b/lib/EpdFont/EpdFont.cpp index 8550cba4..5b770462 100644 --- a/lib/EpdFont/EpdFont.cpp +++ b/lib/EpdFont/EpdFont.cpp @@ -47,14 +47,6 @@ void EpdFont::getTextDimensions(const char* string, int* w, int* h) const { *h = maxY - minY; } -bool EpdFont::hasPrintableChars(const char* string) const { - int w = 0, h = 0; - - getTextDimensions(string, &w, &h); - - return w > 0 || h > 0; -} - const EpdGlyph* EpdFont::getGlyph(const uint32_t cp) const { const EpdUnicodeInterval* intervals = data->intervals; const int count = data->intervalCount; diff --git a/lib/EpdFont/EpdFont.h b/lib/EpdFont/EpdFont.h index c8473fc0..5b0e2f9b 100644 --- a/lib/EpdFont/EpdFont.h +++ b/lib/EpdFont/EpdFont.h @@ -9,7 +9,6 @@ class EpdFont { explicit EpdFont(const EpdFontData* data) : data(data) {} ~EpdFont() = default; void getTextDimensions(const char* string, int* w, int* h) const; - bool hasPrintableChars(const char* string) const; const EpdGlyph* getGlyph(uint32_t cp) const; }; diff --git a/lib/EpdFont/EpdFontFamily.cpp b/lib/EpdFont/EpdFontFamily.cpp index 821153e3..5a1f8cef 100644 --- a/lib/EpdFont/EpdFontFamily.cpp +++ b/lib/EpdFont/EpdFontFamily.cpp @@ -22,10 +22,6 @@ void EpdFontFamily::getTextDimensions(const char* string, int* w, int* h, const getFont(style)->getTextDimensions(string, w, h); } -bool EpdFontFamily::hasPrintableChars(const char* string, const Style style) const { - return getFont(style)->hasPrintableChars(string); -} - const EpdFontData* EpdFontFamily::getData(const Style style) const { return getFont(style)->data; } const EpdGlyph* EpdFontFamily::getGlyph(const uint32_t cp, const Style style) const { diff --git a/lib/EpdFont/EpdFontFamily.h b/lib/EpdFont/EpdFontFamily.h index 64fd9953..746cc507 100644 --- a/lib/EpdFont/EpdFontFamily.h +++ b/lib/EpdFont/EpdFontFamily.h @@ -10,7 +10,6 @@ class EpdFontFamily { : regular(regular), bold(bold), italic(italic), boldItalic(boldItalic) {} ~EpdFontFamily() = default; void getTextDimensions(const char* string, int* w, int* h, Style style = REGULAR) const; - bool hasPrintableChars(const char* string, Style style = REGULAR) const; const EpdFontData* getData(Style style = REGULAR) const; const EpdGlyph* getGlyph(uint32_t cp, Style style = REGULAR) const; diff --git a/lib/GfxRenderer/GfxRenderer.cpp b/lib/GfxRenderer/GfxRenderer.cpp index 8b8c9eac..77dd810c 100644 --- a/lib/GfxRenderer/GfxRenderer.cpp +++ b/lib/GfxRenderer/GfxRenderer.cpp @@ -120,11 +120,6 @@ void GfxRenderer::drawText(const int fontId, const int x, const int y, const cha } const auto& font = fontIt->second; - // no printable characters - if (!font.hasPrintableChars(text, style)) { - return; - } - uint32_t cp; while ((cp = utf8NextCodepoint(reinterpret_cast(&text)))) { renderChar(font, cp, &xpos, &yPos, black, style); @@ -812,11 +807,6 @@ void GfxRenderer::drawTextRotated90CW(const int fontId, const int x, const int y const auto& font = fontIt->second; - // No printable characters - if (!font.hasPrintableChars(text, style)) { - return; - } - // For 90° clockwise rotation: // Original (glyphX, glyphY) -> Rotated (glyphY, -glyphX) // Text reads from bottom to top