summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2015-08-15 16:56:02 +0100
committerChris Young <chris@unsatisfactorysoftware.co.uk>2015-08-15 16:56:02 +0100
commitc43d09af64e578187ce18e2c882d24179d83662c (patch)
tree9d1e4d9364a2ae08ddd001ebeb452ee0ae04b867
parent45171214edd2741e00206df93799a649dcc71384 (diff)
downloadnetsurf-c43d09af64e578187ce18e2c882d24179d83662c.tar.gz
netsurf-c43d09af64e578187ce18e2c882d24179d83662c.tar.bz2
Ensure we don't accidentally use an 8-bit glyphmap under OS3.
-rw-r--r--amiga/font.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/amiga/font.c b/amiga/font.c
index c39b00264..ab40621b3 100644
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -595,18 +595,18 @@ 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);
/**\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 = ami_font_plot_glyph(ofont, rp, utf16, utf16next,
+ tempx = (ofont, rp, utf16, utf16next,
dx + x, dy, emwidth, aa);
}