eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

And one more

Browse Source
This commit is contained in:
jpirnay
2026-04-28 16:16:18 +02:00
parent 2c9a6d7d31
commit 6e26fd7e14
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/GfxRenderer/FontCacheManager.cpp
+15 -4
View File
@@ -15,6 +15,10 @@ void FontCacheManager::setFontDecompressor(FontDecompressor* d) { fontDecompress
void FontCacheManager::clearCache() { void FontCacheManager::clearCache() {
if (fontDecompressor_) fontDecompressor_->clearCache(); if (fontDecompressor_) fontDecompressor_->clearCache();
for (auto& [id, font] : sdCardFonts_) { for (auto& [id, font] : sdCardFonts_) {
if (!font) {
LOG_ERR("FCM", "clearCache: null SdCardFont pointer for fontId=%d", id);
continue;
}
font->clearCache(); font->clearCache();
} }
} }
@@ -23,8 +27,15 @@ void FontCacheManager::prewarmCache(int fontId, const char* utf8Text, uint8_t st
// SD card font prewarm path: prewarm all requested styles in one call // SD card font prewarm path: prewarm all requested styles in one call
auto sdIt = sdCardFonts_.find(fontId); auto sdIt = sdCardFonts_.find(fontId);
if (sdIt != sdCardFonts_.end()) { if (sdIt != sdCardFonts_.end()) {
int missed = sdIt->second->prewarm(utf8Text, styleMask); SdCardFont* sdFont = sdIt->second;
if (missed > 0) { if (!sdFont) {
LOG_ERR("FCM", "prewarmCache(SD): null SdCardFont pointer for fontId=%d", fontId);
return;
}
int missed = sdFont->prewarm(utf8Text, styleMask);
if (missed < 0) {
LOG_ERR("FCM", "prewarmCache(SD): prewarm failed for fontId=%d (styleMask=0x%02X)", fontId, styleMask);
} else if (missed > 0) {
LOG_DBG("FCM", "prewarmCache(SD): %d glyph(s) not found (styleMask=0x%02X)", missed, styleMask); LOG_DBG("FCM", "prewarmCache(SD): %d glyph(s) not found (styleMask=0x%02X)", missed, styleMask);
} }
return; return;
@@ -48,14 +59,14 @@ void FontCacheManager::prewarmCache(int fontId, const char* utf8Text, uint8_t st
void FontCacheManager::logStats(const char* label) { void FontCacheManager::logStats(const char* label) {
if (fontDecompressor_) fontDecompressor_->logStats(label); if (fontDecompressor_) fontDecompressor_->logStats(label);
for (auto& [id, font] : sdCardFonts_) { for (auto& [id, font] : sdCardFonts_) {
font->logStats(label); if (font) font->logStats(label);
} }
} }
void FontCacheManager::resetStats() { void FontCacheManager::resetStats() {
if (fontDecompressor_) fontDecompressor_->resetStats(); if (fontDecompressor_) fontDecompressor_->resetStats();
for (auto& [id, font] : sdCardFonts_) { for (auto& [id, font] : sdCardFonts_) {
font->resetStats(); if (font) font->resetStats();
} }
} }