mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-16 17:22:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Ensure we don't accidentally use an 8-bit glyphmap under OS3."

Browse Source 
This reverts commit c43d09af64.
This commit is contained in:
Chris Young 2015-08-15 17:27:57 +01:00
parent 0c2f466786
commit b19cd801fd
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
amiga/font.c
View File

@ -595,18 +595,18 @@ static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPo
}
#endif
if(aa == true) {
#ifdef __amigaos4__
if (__builtin_expect(aa == false), 0) {
glyphmaptag = OT_GlyphMap8Bit;
template_type = BLITT_ALPHATEMPLATE;
#endif
} else {
glyphmaptag = OT_GlyphMap;
#ifdef __amigaos4__
template_type = BLITT_TEMPLATE;
} 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);
/**\todo use OT_GlyphCode_32 so we get an error for old font engines */
@ -792,7 +792,7 @@ ULONG ami_font_unicode_text(struct RastPort *rp, const char *string, ULONG lengt
else tempx = 0;
if(tempx == 0) {
tempx = (ofont, rp, utf16, utf16next,
tempx = ami_font_plot_glyph(ofont, rp, utf16, utf16next,
dx + x, dy, emwidth, aa);
}