From b19cd801fdf4c9c27000df53250b022c624127f4 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sat, 15 Aug 2015 17:27:57 +0100
Subject: Revert "Ensure we don't accidentally use an 8-bit glyphmap under
 OS3."

This reverts commit c43d09af64e578187ce18e2c882d24179d83662c.
---
 amiga/font.c | 14 +++++++-------
 1 file 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);
 		}
 
-- 
cgit v1.2.3