preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-09 22:23:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20237 from hrydgard/sdl-fixes

Browse Source 
SDL text renderer: Add some sanity checks.
This commit is contained in:
Henrik Rydgård
2025-04-11 11:38:48 +02:00
committed by GitHub
parent 88d7b668e8 f2d35d204b
commit 2ce9b2329d
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/Render/Text/draw_text_sdl.cpp
+15 -4
View File
@@ -187,7 +187,12 @@ void TextDrawerSDL::PrepareFallbackFonts(std::string_view locale) {
}
uint32_t TextDrawerSDL::CheckMissingGlyph(std::string_view text) {
TTF_Font *font = fontMap_.find(fontHash_)->second;
auto iter = fontMap_.find(fontHash_);
if (iter == fontMap_.end()) {
return 0;
}
TTF_Font *font = iter->second;
UTF8 utf8Decoded(text);
uint32_t missingGlyph = 0;
@@ -285,7 +290,7 @@ void TextDrawerSDL::MeasureStringInternal(std::string_view str, float *w, float
if (missingGlyph) {
int fallbackFont = FindFallbackFonts(missingGlyph, ptSize);
if (fallbackFont >= 0) {
if (fallbackFont >= 0 && fallbackFont < (int)fallbackFonts_.size()) {
font = fallbackFonts_[fallbackFont];
}
}
@@ -319,14 +324,20 @@ bool TextDrawerSDL::DrawStringBitmap(std::vector<uint8_t> &bitmapData, TextStrin
processedStr.push_back(' ');
}
TTF_Font *font = fontMap_.find(fontHash_)->second;
auto fontIter = fontMap_.find(fontHash_);
if (fontIter == fontMap_.end()) {
ERROR_LOG(Log::G3D, "Font hash not in map: %08x", fontHash_);
return false;
}
TTF_Font *font = fontIter->second;
int ptSize = TTF_FontHeight(font) / 1.35;
uint32_t missingGlyph = CheckMissingGlyph(processedStr);
if (missingGlyph) {
int fallbackFont = FindFallbackFonts(missingGlyph, ptSize);
if (fallbackFont >= 0) {
if (fallbackFont >= 0 && fallbackFont < (int)fallbackFonts_.size()) {
font = fallbackFonts_[fallbackFont];
}
}