diff options
author | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
---|---|---|
committer | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
commit | 0703404654d2a40cacae2d94c6e0e22ca28b4acf (patch) | |
tree | bfdbe1e8952814f73a6b0e190ae0a77fd0cfc7bd /amiga/font.c | |
parent | 54f719aa960159c5b1978846223732c9669ca7fa (diff) | |
parent | 89856f55929907642013e45435b9d18cd1fafe36 (diff) | |
download | netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.gz netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.bz2 |
Merge branch 'master' into mono/removing-windom-dependencymono/removing-windom-dependency
Conflicts:
atari/toolbar.c
Diffstat (limited to 'amiga/font.c')
-rw-r--r-- | amiga/font.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/amiga/font.c b/amiga/font.c index ffecf85fe..33f71a926 100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -156,7 +156,7 @@ bool nsfont_position_in_string(const plot_font_style_t *fstyle, for(i=0;i<len;i++) { - if (*utf16 < 0xD800 || 0xDFFF < *utf16) + if ((*utf16 < 0xD800) || (0xDFFF < *utf16)) utf16charlen = 1; else utf16charlen = 2; @@ -263,7 +263,7 @@ bool nsfont_split(const plot_font_style_t *fstyle, { utf8len = utf8_char_byte_length(string+utf8clen); - if (*utf16 < 0xD800 || 0xDFFF < *utf16) + if ((*utf16 < 0xD800) || (0xDFFF < *utf16)) utf16charlen = 1; else utf16charlen = 2; @@ -722,7 +722,7 @@ ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, while(*utf16 != 0) { - if (*utf16 < 0xD800 || 0xDFFF < *utf16) + if ((*utf16 < 0xD800) || (0xDFFF < *utf16)) utf16charlen = 1; else utf16charlen = 2; |