30 lines
981 B
Plaintext
30 lines
981 B
Plaintext
$OpenBSD: patch-src_font_c,v 1.2 2011/11/07 09:35:53 dcoppa Exp $
|
|
|
|
Fix with fribidi 0.19.x
|
|
|
|
--- src/font.c.orig Mon Sep 26 00:28:02 2011
|
|
+++ src/font.c Mon Nov 7 09:57:46 2011
|
|
@@ -212,7 +212,7 @@ void RenderString(Drawable d, FontType font, ColorType
|
|
#ifdef USE_FRIBIDI
|
|
|
|
FriBidiChar *temp;
|
|
- FriBidiCharType type = FRIBIDI_TYPE_ON;
|
|
+ FriBidiParType type = FRIBIDI_TYPE_ON;
|
|
int unicodeLength;
|
|
|
|
#endif
|
|
@@ -248,11 +248,11 @@ void RenderString(Drawable d, FontType font, ColorType
|
|
#ifdef USE_FRIBIDI
|
|
|
|
temp = AllocateStack((len + 1) * sizeof(FriBidiChar));
|
|
- unicodeLength = fribidi_utf8_to_unicode((char*)str, len, temp);
|
|
+ unicodeLength = fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8, (char*)str, len, temp);
|
|
|
|
fribidi_log2vis(temp, unicodeLength, &type, temp, NULL, NULL, NULL);
|
|
|
|
- fribidi_unicode_to_utf8(temp, len, (char*)temp);
|
|
+ fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, temp, len, (char*)temp);
|
|
output = (char*)temp;
|
|
|
|
#else
|