preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-25 11:19:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #817 from raven02/patch-4

Browse Source 
Fix crash when font sets not exists and create flash0:/font/ if not exists
This commit is contained in:
Henrik Rydgård committed 2013-02-28 07:16:08 -08:00
2 parents 892422b408 e319e2a7c2
commit ef95bcba8f
1 file changed
+8 -1
Download Patch File Download Diff File Expand all files Collapse all files
Core/HLE/sceFont.cpp
+8 -1
View File
@@ -364,6 +364,9 @@ LoadedFont *GetLoadedFont(u32 handle, bool allowClosed) {
void __LoadInternalFonts() {
std::string fontPath = "flash0:/font/";
if (!pspFileSystem.GetFileInfo(fontPath).exists) {
pspFileSystem.MkDir(fontPath);
}
for (size_t i = 0; i < ARRAY_SIZE(fontRegistry); i++) {
const FontRegistryEntry &entry = fontRegistry[i];
std::string fontFilename = fontPath + entry.fileName;
@@ -633,7 +636,7 @@ int sceFontGetFontInfo(u32 fontHandle, u32 fontInfoPtr) {
if (!Memory::IsValidAddress(fontInfoPtr))
return 0;
LoadedFont * font = GetLoadedFont(fontHandle, true);
LoadedFont *font = GetLoadedFont(fontHandle, true);
if (!font)
return 0;
PGF *pgf = font->GetFont()->GetPGF();
@@ -709,6 +712,10 @@ int sceFontGetCharGlyphImage(u32 fontHandle, u32 charCode, u32 glyphImagePtr) {
int buffer = Memory::Read_U32(glyphImagePtr+20);
LoadedFont *font = GetLoadedFont(fontHandle, false);
if (!font) {
ERROR_LOG(HLE, "%08x is not a valid font handle!", fontHandle);
return 0;
}
int altCharCode = font->GetFontLib()->GetAltCharCode();
font->GetFont()->GetPGF()->DrawCharacter(buffer, bytesPerLine, bufWidth, bufHeight, xPos64 >> 6, yPos64 >> 6, 0, 0, 8192, 8192, pixelFormat, charCode, altCharCode, FONT_PGF_CHARGLYPH);
return 0;