summaryrefslogtreecommitdiff
path: root/pkg/netsurf/patch/0004-framebuffer-Fix-font-layout-function-return-values.patch
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-12-23 15:32:20 -0800
committerMichael Forney <mforney@mforney.org>2016-12-29 23:29:18 -0800
commite7181404bf50baf29e3a3d9f0e9ebe8a97566316 (patch)
tree2ef48628d13ee934f9d43a37f1e4d58c6bb46ca1 /pkg/netsurf/patch/0004-framebuffer-Fix-font-layout-function-return-values.patch
parent5084e84171fc00de2d65abd61e55577cd1fe1bff (diff)
Add netsurf 3.6
{nsgenbind,webidl}-{lexer,parser}.{c,h} were generated using flex and bison on unmodified 0.4 sources.
Diffstat (limited to 'pkg/netsurf/patch/0004-framebuffer-Fix-font-layout-function-return-values.patch')
-rw-r--r--pkg/netsurf/patch/0004-framebuffer-Fix-font-layout-function-return-values.patch112
1 files changed, 112 insertions, 0 deletions
diff --git a/pkg/netsurf/patch/0004-framebuffer-Fix-font-layout-function-return-values.patch b/pkg/netsurf/patch/0004-framebuffer-Fix-font-layout-function-return-values.patch
new file mode 100644
index 00000000..accd9cc0
--- /dev/null
+++ b/pkg/netsurf/patch/0004-framebuffer-Fix-font-layout-function-return-values.patch
@@ -0,0 +1,112 @@
+From 507e82825f659742b76df9179e59975b3bd55b30 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sun, 25 Dec 2016 00:23:34 -0800
+Subject: [PATCH] framebuffer: Fix font layout function return values
+
+The return type is nserror, so they should return NSERROR_OK, not true.
+---
+ frontends/framebuffer/font_freetype.c | 10 +++++-----
+ frontends/framebuffer/font_internal.c | 10 +++++-----
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c
+index 9235ad476..42be6d443 100644
+--- a/frontends/framebuffer/font_freetype.c
++++ b/frontends/framebuffer/font_freetype.c
+@@ -445,7 +445,7 @@ fb_font_width(const plot_font_style_t *fstyle,
+ *width += glyph->advance.x >> 16;
+ }
+
+- return true;
++ return NSERROR_OK;
+ }
+
+
+@@ -481,7 +481,7 @@ fb_font_position(const plot_font_style_t *fstyle,
+ *actual_x = prev_x;
+
+ *char_offset = nxtchr;
+- return true;
++ return NSERROR_OK;
+ }
+
+
+@@ -494,7 +494,7 @@ fb_font_position(const plot_font_style_t *fstyle,
+ * \param x width available
+ * \param char_offset updated to offset in string of actual_x, [1..length]
+ * \param actual_x updated to x coordinate of character closest to x
+- * \return true on success, false on error and error reported
++ * \return NSERROR_OK on success or error code on failure
+ *
+ * On exit, char_offset indicates first character after split point.
+ *
+@@ -537,7 +537,7 @@ fb_font_split(const plot_font_style_t *fstyle,
+ * found a space; return previous space */
+ *actual_x = last_space_x;
+ *char_offset = last_space_idx;
+- return true;
++ return NSERROR_OK;
+ }
+
+ nxtchr = utf8_next(string, length, nxtchr);
+@@ -545,7 +545,7 @@ fb_font_split(const plot_font_style_t *fstyle,
+
+ *char_offset = nxtchr;
+
+- return true;
++ return NSERROR_OK;
+ }
+
+ static struct gui_layout_table layout_table = {
+diff --git a/frontends/framebuffer/font_internal.c b/frontends/framebuffer/font_internal.c
+index 9164a29db..a9054098f 100644
+--- a/frontends/framebuffer/font_internal.c
++++ b/frontends/framebuffer/font_internal.c
+@@ -364,7 +364,7 @@ fb_font_width(const plot_font_style_t *fstyle,
+ }
+
+ *width *= fb_get_font_size(fstyle);
+- return true;
++ return NSERROR_OK;
+ }
+
+
+@@ -397,7 +397,7 @@ fb_font_position(const plot_font_style_t *fstyle,
+ *actual_x = x_pos;
+
+ *char_offset = nxtchr;
+- return true;
++ return NSERROR_OK;
+ }
+
+
+@@ -410,7 +410,7 @@ fb_font_position(const plot_font_style_t *fstyle,
+ * \param x width available
+ * \param char_offset updated to offset in string of actual_x, [1..length]
+ * \param actual_x updated to x coordinate of character closest to x
+- * \return true on success, false on error and error reported
++ * \return NSERROR_OK on success or error code on failure
+ *
+ * On exit, char_offset indicates first character after split point.
+ *
+@@ -455,7 +455,7 @@ fb_font_split(const plot_font_style_t *fstyle,
+ * found a space; return previous space */
+ *actual_x = last_space_x;
+ *char_offset = last_space_idx;
+- return true;
++ return NSERROR_OK;
+ }
+
+ nxtchr = utf8_next(string, length, nxtchr);
+@@ -463,7 +463,7 @@ fb_font_split(const plot_font_style_t *fstyle,
+
+ *char_offset = nxtchr;
+
+- return true;
++ return NSERROR_OK;
+ }
+
+
+--
+2.11.0
+