Port our UTF-8 routines to parserutils (only enabled when building against Hubbub).

Sync our temporary internal copies of these functions with parserutils (which is rather better tested and fixes a number of known bugs in NetSurf's previous UTF-8 handling).
Ideally, this will be the only place in NetSurf that has any dependency on parserutils, so port the amiga font code to our internal APIs.

svn path=/trunk/netsurf/; revision=6550

1 files changed, 7 insertions, 2 deletions

diff --git a/utils/utf8.h b/utils/utf8.h
index e33b07d0d..9d8ec74fa 100644
--- a/utils/utf8.h
+++ b/utils/utf8.h
@@ -23,16 +23,21 @@
 #ifndef _NETSURF_UTILS_UTF8_H_
 #define _NETSURF_UTILS_UTF8_H_
 
+#include <stdint.h>
+
 typedef enum {
 	UTF8_CONVERT_OK,
 	UTF8_CONVERT_NOMEM,
 	UTF8_CONVERT_BADENC
 } utf8_convert_ret;
 
-size_t utf8_to_ucs4(const char *s, size_t l);
-size_t utf8_from_ucs4(size_t c, char *s);
+uint32_t utf8_to_ucs4(const char *s, size_t l);
+size_t utf8_from_ucs4(uint32_t c, char *s);
 
 size_t utf8_length(const char *s);
+size_t utf8_bounded_length(const char *s, size_t l);
+
+size_t utf8_char_byte_length(const char *s);
 
 size_t utf8_prev(const char *s, size_t o);
 size_t utf8_next(const char *s, size_t l, size_t o);