QB64/QB64-PE
QB64/QB64-PE
1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-07-06 02:20:25 +00:00
Code Issues Releases Wiki Activity

Fix macOS seg-fault reported by @grymmjack

Browse source
This commit is contained in:
Samuel Gomes 2023-09-14 07:19:22 +05:30
parent 25cbfc9bff
commit 8548d090fc
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -16,3 +16,4 @@ internal/c/qbx[2-9].cpp
mingw32.exe mingw32.exe
mingw64.exe mingw64.exe
.vscode .vscode
.DS_Store

8
internal/c/parts/video/font/font.cpp
View file

@ -876,6 +876,8 @@ int32_t FontPrintWidthUTF32(int32_t fh, const uint32_t *codepoint, int32_t codep
if (codepoints > 0) { if (codepoints > 0) {
FONT_DEBUG_CHECK(IS_VALID_FONT_HANDLE(fh)); FONT_DEBUG_CHECK(IS_VALID_FONT_HANDLE(fh));
FONT_DEBUG_PRINT("codepoint = %p, codepoints = %i", codepoint, codepoints);
// Get the actual width in pixels // Get the actual width in pixels
return fontManager.fonts[fh]->GetStringPixelWidth(codepoint, codepoints); return fontManager.fonts[fh]->GetStringPixelWidth(codepoint, codepoints);
} }
@ -893,7 +895,8 @@ int32_t FontPrintWidthASCII(int32_t fh, const uint8_t *codepoint, int32_t codepo
FONT_DEBUG_CHECK(IS_VALID_FONT_HANDLE(fh)); FONT_DEBUG_CHECK(IS_VALID_FONT_HANDLE(fh));
// Atempt to convert the string to UTF32 and get the actual width in pixels // Atempt to convert the string to UTF32 and get the actual width in pixels
return FontPrintWidthUTF32(fh, utf32.codepoints.data(), utf32.ConvertASCII(codepoint, codepoints)); auto count = utf32.ConvertASCII(codepoint, codepoints);
return FontPrintWidthUTF32(fh, utf32.codepoints.data(), count);
} }
return 0; return 0;
@ -995,7 +998,8 @@ bool FontRenderTextASCII(int32_t fh, const uint8_t *codepoint, int32_t codepoint
FONT_DEBUG_CHECK(IS_VALID_FONT_HANDLE(fh)); FONT_DEBUG_CHECK(IS_VALID_FONT_HANDLE(fh));
// Atempt to convert the string to UTF32 and forward to FontRenderTextUTF32() // Atempt to convert the string to UTF32 and forward to FontRenderTextUTF32()
return FontRenderTextUTF32(fh, utf32.codepoints.data(), utf32.ConvertASCII(codepoint, codepoints), options, out_data, out_x, out_y); auto count = utf32.ConvertASCII(codepoint, codepoints);
return FontRenderTextUTF32(fh, utf32.codepoints.data(), count, options, out_data, out_x, out_y);
} }
return false; return false;