summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2011-12-02 17:46:57 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2011-12-02 17:46:57 +0000
commitebebdfda4bf4732aca57edc493ea07c98b9ec9d6 (patch)
treeaba1efd0098490601ae899658bcd8f5a7b013f7a
parente2a7600e9a2fe94a00e653b0f484d941129c3ad5 (diff)
downloadnetsurf-ebebdfda4bf4732aca57edc493ea07c98b9ec9d6.tar.gz
netsurf-ebebdfda4bf4732aca57edc493ea07c98b9ec9d6.tar.bz2
Fix framebuffer build.
svn path=/trunk/netsurf/; revision=13222
-rw-r--r--framebuffer/font_freetype.c16
-rw-r--r--framebuffer/font_internal.c16
2 files changed, 32 insertions, 0 deletions
diff --git a/framebuffer/font_freetype.c b/framebuffer/font_freetype.c
index bd17d6366..5fc305616 100644
--- a/framebuffer/font_freetype.c
+++ b/framebuffer/font_freetype.c
@@ -83,6 +83,22 @@ utf8_convert_ret utf8_to_local_encoding(const char *string,
return utf8_to_enc(string, "UTF-8", len, result);
}
+utf8_convert_ret utf8_from_local_encoding(const char *string,
+ size_t len,
+ char **result)
+{
+ *result = malloc(len + 1);
+ if (*result == NULL) {
+ return UTF8_CONVERT_NOMEM;
+ }
+
+ memcpy(*result, string, len);
+
+ (*result)[len] = '\0';
+
+ return UTF8_CONVERT_OK;
+}
+
/* map cache manager handle to face id */
static FT_Error ft_face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointer request_data, FT_Face *face )
{
diff --git a/framebuffer/font_internal.c b/framebuffer/font_internal.c
index 93cf0f8f8..6ef13d51a 100644
--- a/framebuffer/font_internal.c
+++ b/framebuffer/font_internal.c
@@ -70,6 +70,22 @@ utf8_convert_ret utf8_to_local_encoding(const char *string,
}
+utf8_convert_ret utf8_from_local_encoding(const char *string,
+ size_t len,
+ char **result)
+{
+ *result = malloc(len + 1);
+ if (*result == NULL) {
+ return UTF8_CONVERT_NOMEM;
+ }
+
+ memcpy(*result, string, len);
+
+ (*result)[len] = '\0';
+
+ return UTF8_CONVERT_OK;
+}
+
static bool nsfont_width(const plot_font_style_t *fstyle,
const char *string, size_t length,
int *width)