diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-08-15 17:27:57 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-08-15 17:27:57 +0100 |
| commit | b19cd801fdf4c9c27000df53250b022c624127f4 (patch) | |
| tree | 3c4360b608f316c1a75f02c94665aad52f5b14e4 /amiga/font.c | |
| parent | 0c2f4667863d3579947b7c73b43bec61f9d9140d (diff) | |
| download | netsurf-b19cd801fdf4c9c27000df53250b022c624127f4.tar.gz netsurf-b19cd801fdf4c9c27000df53250b022c624127f4.tar.bz2 | |
Revert "Ensure we don't accidentally use an 8-bit glyphmap under OS3."
This reverts commit c43d09af64e578187ce18e2c882d24179d83662c.
Diffstat (limited to 'amiga/font.c')
| -rw-r--r-- | amiga/font.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/amiga/font.c b/amiga/font.c index ab40621b3..c39b00264 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__ - 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); } |