From 654da2ffb5abf2afe9532f1d0cb77ed88f8a97cc Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 28 Jan 2014 21:40:13 +0000 Subject: move utf8 conversion routines to use nserror instead of their own error enum --- atari/plot/font_internal.c | 2 +- atari/plot/font_vdi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'atari/plot') diff --git a/atari/plot/font_internal.c b/atari/plot/font_internal.c index 2b0025a71..e3c806cfe 100644 --- a/atari/plot/font_internal.c +++ b/atari/plot/font_internal.c @@ -72,7 +72,7 @@ fb_get_font(const plot_font_style_t *fstyle) } } -static utf8_convert_ret utf8_to_font_encoding(const struct fb_font_desc* font, +static nserror utf8_to_font_encoding(const struct fb_font_desc* font, const char *string, size_t len, char **result) diff --git a/atari/plot/font_vdi.c b/atari/plot/font_vdi.c index 340759f02..0c914b82b 100755 --- a/atari/plot/font_vdi.c +++ b/atari/plot/font_vdi.c @@ -267,7 +267,7 @@ static int text( FONT_PLOTTER self, int x, int y, const char *text, size_t leng short fx=0; GRECT canvas; char *lstr = NULL; - assert( utf8_to_local_encoding(text, length, &lstr) == UTF8_CONVERT_OK); + assert( utf8_to_local_encoding(text, length, &lstr) == NSERROR_OK); assert( lstr != NULL ); int slen = strlen(lstr); -- cgit v1.2.3