|
@@ -127,14 +127,14 @@ HL_PRIM int hl_from_utf8( uchar *out, int outLen, const char *str ) {
|
|
HL_PRIM uchar *hl_to_utf16( const char *str ) {
|
|
HL_PRIM uchar *hl_to_utf16( const char *str ) {
|
|
int len = hl_utf8_length((vbyte*)str,0);
|
|
int len = hl_utf8_length((vbyte*)str,0);
|
|
uchar *out = (uchar*)hl_gc_alloc_noptr((len + 1) * sizeof(uchar));
|
|
uchar *out = (uchar*)hl_gc_alloc_noptr((len + 1) * sizeof(uchar));
|
|
- hl_from_utf8(out,len+1,str);
|
|
|
|
|
|
+ hl_from_utf8(out,len,str);
|
|
return out;
|
|
return out;
|
|
}
|
|
}
|
|
|
|
|
|
HL_PRIM vbyte* hl_utf8_to_utf16( vbyte *str, int pos, int *size ) {
|
|
HL_PRIM vbyte* hl_utf8_to_utf16( vbyte *str, int pos, int *size ) {
|
|
int ulen = hl_utf8_length(str, pos);
|
|
int ulen = hl_utf8_length(str, pos);
|
|
uchar *s = (uchar*)hl_gc_alloc_noptr((ulen + 1)*sizeof(uchar));
|
|
uchar *s = (uchar*)hl_gc_alloc_noptr((ulen + 1)*sizeof(uchar));
|
|
- hl_from_utf8(s,ulen+1,(char*)(str+pos));
|
|
|
|
|
|
+ hl_from_utf8(s,ulen,(char*)(str+pos));
|
|
*size = ulen << 1;
|
|
*size = ulen << 1;
|
|
return (vbyte*)s;
|
|
return (vbyte*)s;
|
|
}
|
|
}
|