netsurf: branch master updated. release/3.0-146-g1bbafde

NetSurf Browser Project (Commit Mailer) no-reply at netsurf-browser.org
Tue May 28 21:09:29 BST 2013


Gitweb links:

...log http://git.netsurf-browser.org/netsurf.git/shortlog/1bbafde641f05068c50b0c4ccd3ee0ec4a5c69d9
...commit http://git.netsurf-browser.org/netsurf.git/commit/1bbafde641f05068c50b0c4ccd3ee0ec4a5c69d9
...tree http://git.netsurf-browser.org/netsurf.git/tree/1bbafde641f05068c50b0c4ccd3ee0ec4a5c69d9

The branch, master has been updated
       via  1bbafde641f05068c50b0c4ccd3ee0ec4a5c69d9 (commit)
      from  2d483113ef9dac00c7fbe7548a9aa37248c14803 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1bbafde641f05068c50b0c4ccd3ee0ec4a5c69d9
commit 1bbafde641f05068c50b0c4ccd3ee0ec4a5c69d9
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    Further split fixing

diff --git a/amiga/font.c b/amiga/font.c
index f10db53..21f2635 100755
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -308,7 +308,7 @@ bool nsfont_split(const plot_font_style_t *fstyle,
 	*char_offset = 0;
 	*actual_x = 0;
 
-	do {
+	while (utf8_pos < length) {
 		if ((*utf16 < 0xD800) || (0xDBFF < *utf16))
 			utf16charlen = 1;
 		else
@@ -327,6 +327,8 @@ bool nsfont_split(const plot_font_style_t *fstyle,
 						utf16next, emwidth);
 		}
 
+		tx += tempx;
+
 		/* Check whether we have a space */
 		if (*(string + utf8_pos) == ' ') {
 			/* Got a space */
@@ -348,10 +350,9 @@ bool nsfont_split(const plot_font_style_t *fstyle,
 			return true;
 		}
 
-		tx += tempx;		
 		utf16 = utf16next;
 		utf8_pos = utf8_next(string, length, utf8_pos);
-	} while (utf8_pos < length);
+	};
 
 	free(outf16);
 


-----------------------------------------------------------------------

Summary of changes:
 amiga/font.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/amiga/font.c b/amiga/font.c
index f10db53..21f2635 100755
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -308,7 +308,7 @@ bool nsfont_split(const plot_font_style_t *fstyle,
 	*char_offset = 0;
 	*actual_x = 0;
 
-	do {
+	while (utf8_pos < length) {
 		if ((*utf16 < 0xD800) || (0xDBFF < *utf16))
 			utf16charlen = 1;
 		else
@@ -327,6 +327,8 @@ bool nsfont_split(const plot_font_style_t *fstyle,
 						utf16next, emwidth);
 		}
 
+		tx += tempx;
+
 		/* Check whether we have a space */
 		if (*(string + utf8_pos) == ' ') {
 			/* Got a space */
@@ -348,10 +350,9 @@ bool nsfont_split(const plot_font_style_t *fstyle,
 			return true;
 		}
 
-		tx += tempx;		
 		utf16 = utf16next;
 		utf8_pos = utf8_next(string, length, utf8_pos);
-	} while (utf8_pos < length);
+	};
 
 	free(outf16);
 


-- 
NetSurf Browser



More information about the netsurf-commits mailing list