From 3457d3adc7b94bb9e8715a35a0e5a8377db88856 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 1 Jun 2014 08:44:51 +0100 Subject: Sometimes (but not always) the UTF-16 conversion inserts a BOM. Skip it. --- amiga/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/amiga/font.c b/amiga/font.c index 93bee3cf0..8fc87d7f0 100755 --- a/amiga/font.c +++ b/amiga/font.c @@ -311,6 +311,8 @@ bool nsfont_split(const plot_font_style_t *fstyle, *char_offset = 0; *actual_x = 0; + if (*utf16 == 0xFEFF) utf16++; + while (utf8_pos < length) { if ((*utf16 < 0xD800) || (0xDBFF < *utf16)) utf16next = utf16 + 1; -- cgit v1.2.3 From a98b946ca2e6982be3c12eeffdfbc0656a71e5cb Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 1 Jun 2014 08:45:29 +0100 Subject: Confidently remove the debug --- amiga/font.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/amiga/font.c b/amiga/font.c index 8fc87d7f0..7af70561e 100755 --- a/amiga/font.c +++ b/amiga/font.c @@ -341,10 +341,6 @@ bool nsfont_split(const plot_font_style_t *fstyle, if ((x < tx) && (*char_offset != 0)) { /* Reached available width, and a space was found; * split there. */ - LOG(("Split %u chars at %ipx: " - "Split at char %i (%ipx) - %.*s", - length, x, *char_offset, *actual_x, - *char_offset, string)); free(utf16_str); return true; } -- cgit v1.2.3 From ea01d6b3fc6ea73de24789797fb3fde5e3a26693 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 1 Jun 2014 08:46:22 +0100 Subject: Double the stack as it still runs out on occasion --- amiga/gui.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amiga/gui.c b/amiga/gui.c index 11f874b12..1501a5f88 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -180,7 +180,7 @@ bool cli_force = false; static char *current_user; static char *current_user_dir; -static const __attribute__((used)) char *stack_cookie = "\0$STACK:131072\0"; +static const __attribute__((used)) char *stack_cookie = "\0$STACK:262144\0"; const char * const versvn; const char * const verdate; -- cgit v1.2.3