|
|
|
@ -277,11 +277,6 @@ void TrueTypeFontCache::SetGlyphPtr(GlyphID key, const GlyphEntry *glyph, bool d
|
|
|
|
|
this->glyph_to_sprite[GB(key, 8, 8)][GB(key, 0, 8)].duplicate = duplicate;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void *AllocateFont(size_t size)
|
|
|
|
|
{
|
|
|
|
|
return MallocT<byte>(size);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Check if a glyph should be rendered with anti-aliasing. */
|
|
|
|
|
static bool GetFontAAState(FontSize size)
|
|
|
|
@ -355,7 +350,7 @@ const Sprite *TrueTypeFontCache::GetGlyph(GlyphID key)
|
|
|
|
|
builtin_questionmark_data
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Sprite *spr = BlitterFactory::GetCurrentBlitter()->Encode(&builtin_questionmark, AllocateFont);
|
|
|
|
|
Sprite *spr = BlitterFactory::GetCurrentBlitter()->Encode(&builtin_questionmark, SimpleSpriteAlloc);
|
|
|
|
|
assert(spr != nullptr);
|
|
|
|
|
GlyphEntry new_glyph;
|
|
|
|
|
new_glyph.sprite = spr;
|
|
|
|
@ -643,7 +638,7 @@ const Sprite *FreeTypeFontCache::InternalGetGlyph(GlyphID key, bool aa)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
GlyphEntry new_glyph;
|
|
|
|
|
new_glyph.sprite = BlitterFactory::GetCurrentBlitter()->Encode(&sprite, AllocateFont);
|
|
|
|
|
new_glyph.sprite = BlitterFactory::GetCurrentBlitter()->Encode(&sprite, SimpleSpriteAlloc);
|
|
|
|
|
new_glyph.width = slot->advance.x >> 6;
|
|
|
|
|
|
|
|
|
|
this->SetGlyphPtr(key, &new_glyph);
|
|
|
|
|