From ebebdfda4bf4732aca57edc493ea07c98b9ec9d6 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 2 Dec 2011 17:46:57 +0000 Subject: Fix framebuffer build. svn path=/trunk/netsurf/; revision=13222 --- framebuffer/font_freetype.c | 16 ++++++++++++++++ framebuffer/font_internal.c | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) 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) -- cgit v1.2.3