summaryrefslogtreecommitdiff
path: root/src/os
diff options
context:
space:
mode:
authorMichael Lutz <michi@icosahedron.de>2021-01-16 16:43:31 +0100
committerMichael Lutz <michi@icosahedron.de>2021-02-22 22:16:07 +0100
commit6776229047c0f5aac540fc9c367e4abbf5302322 (patch)
tree7fbb643e28155e37d784770894f419383a6bc8e9 /src/os
parent70aa3b401145ec6bb98073a2758206cf63e15da1 (diff)
downloadopenttd-6776229047c0f5aac540fc9c367e4abbf5302322.tar.xz
Codechange: Make the simple Malloc sprite allocator globally usable.
Diffstat (limited to 'src/os')
-rw-r--r--src/os/macosx/font_osx.cpp2
-rw-r--r--src/os/windows/font_win32.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/os/macosx/font_osx.cpp b/src/os/macosx/font_osx.cpp
index 04e5db9ab..f5ceed850 100644
--- a/src/os/macosx/font_osx.cpp
+++ b/src/os/macosx/font_osx.cpp
@@ -333,7 +333,7 @@ const Sprite *CoreTextFontCache::InternalGetGlyph(GlyphID key, bool use_aa)
}
GlyphEntry new_glyph;
- new_glyph.sprite = BlitterFactory::GetCurrentBlitter()->Encode(&sprite, AllocateFont);
+ new_glyph.sprite = BlitterFactory::GetCurrentBlitter()->Encode(&sprite, SimpleSpriteAlloc);
new_glyph.width = (byte)std::round(CTFontGetAdvancesForGlyphs(this->font.get(), kCTFontOrientationDefault, &glyph, nullptr, 1));
this->SetGlyphPtr(key, &new_glyph);
diff --git a/src/os/windows/font_win32.cpp b/src/os/windows/font_win32.cpp
index a3b60933c..1b4a41ccf 100644
--- a/src/os/windows/font_win32.cpp
+++ b/src/os/windows/font_win32.cpp
@@ -532,7 +532,7 @@ void Win32FontCache::ClearFontCache()
}
GlyphEntry new_glyph;
- new_glyph.sprite = BlitterFactory::GetCurrentBlitter()->Encode(&sprite, AllocateFont);
+ new_glyph.sprite = BlitterFactory::GetCurrentBlitter()->Encode(&sprite, SimpleSpriteAlloc);
new_glyph.width = gm.gmCellIncX;
this->SetGlyphPtr(key, &new_glyph);