mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-07 11:32:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.netsurf-browser.org/netsurf

Browse Source
This commit is contained in:
Michael Drake 2014-06-01 11:45:19 +01:00
commit 576e93e1f3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
amiga/font.c
View File

@ -311,6 +311,8 @@ bool nsfont_split(const plot_font_style_t *fstyle,
*char_offset = 0; *char_offset = 0;
*actual_x = 0; *actual_x = 0;
if (*utf16 == 0xFEFF) utf16++;
while (utf8_pos < length) { while (utf8_pos < length) {
if ((*utf16 < 0xD800) || (0xDBFF < *utf16)) if ((*utf16 < 0xD800) || (0xDBFF < *utf16))
utf16next = utf16 + 1; utf16next = utf16 + 1;
@ -339,10 +341,6 @@ bool nsfont_split(const plot_font_style_t *fstyle,
if ((x < tx) && (*char_offset != 0)) { if ((x < tx) && (*char_offset != 0)) {
/* Reached available width, and a space was found; /* Reached available width, and a space was found;
* split there. */ * 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); free(utf16_str);
return true; return true;
} }

2
amiga/gui.c
View File

@ -180,7 +180,7 @@ bool cli_force = false;
static char *current_user; static char *current_user;
static char *current_user_dir; 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 versvn;
const char * const verdate; const char * const verdate;