Ensure we don't accidentally use an 8-bit glyphmap under OS3.
This commit is contained in:
parent
45171214ed
commit
c43d09af64
12
amiga/font.c
12
amiga/font.c
|
@ -595,17 +595,17 @@ static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPo
|
|||
}
|
||||
#endif
|
||||
|
||||
if(aa == true) {
|
||||
#ifdef __amigaos4__
|
||||
glyphmaptag = OT_GlyphMap8Bit;
|
||||
template_type = BLITT_ALPHATEMPLATE;
|
||||
if (__builtin_expect(aa == false), 0) {
|
||||
#endif
|
||||
} else {
|
||||
glyphmaptag = OT_GlyphMap;
|
||||
#ifdef __amigaos4__
|
||||
template_type = BLITT_TEMPLATE;
|
||||
#endif
|
||||
} else {
|
||||
glyphmaptag = OT_GlyphMap8Bit;
|
||||
template_type = BLITT_ALPHATEMPLATE;
|
||||
}
|
||||
#endif
|
||||
|
||||
long_char_1 = amiga_nsfont_decode_surrogate(char1);
|
||||
long_char_2 = amiga_nsfont_decode_surrogate(char2);
|
||||
|
@ -792,7 +792,7 @@ ULONG ami_font_unicode_text(struct RastPort *rp, const char *string, ULONG lengt
|
|||
else tempx = 0;
|
||||
|
||||
if(tempx == 0) {
|
||||
tempx = ami_font_plot_glyph(ofont, rp, utf16, utf16next,
|
||||
tempx = (ofont, rp, utf16, utf16next,
|
||||
dx + x, dy, emwidth, aa);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue