diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2014-06-01 11:45:19 +0100 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2014-06-01 11:45:19 +0100 |
| commit | 576e93e1f33614003dd876b93f2f5bbf8228eeed (patch) | |
| tree | 35959163bbc21dc9c36416b5ffd5cc212936344b | |
| parent | 91f3eb5c2ffcaf3f3b09ba24069f08a7a953ee0c (diff) | |
| parent | ea01d6b3fc6ea73de24789797fb3fde5e3a26693 (diff) | |
| download | netsurf-576e93e1f33614003dd876b93f2f5bbf8228eeed.tar.gz netsurf-576e93e1f33614003dd876b93f2f5bbf8228eeed.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
| -rwxr-xr-x | amiga/font.c | 6 | ||||
| -rw-r--r-- | amiga/gui.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/amiga/font.c b/amiga/font.c index 93bee3cf0..7af70561e 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; @@ -339,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; } 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; |