Fix a segfault when using unicode chars with ttf fonts

ok sthen@
This commit is contained in:
giovanni 2009-02-13 13:57:17 +00:00
parent d82db3b07f
commit 3a31fb191a
2 changed files with 20 additions and 2 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.46 2007/11/14 09:43:40 steven Exp $
# $OpenBSD: Makefile,v 1.47 2009/02/13 13:57:17 giovanni Exp $
COMMENT= X11-based presentation tool
DISTNAME= magicpoint-1.09a
# hack
PKGNAME= magicpoint-1.11bp6
PKGNAME= magicpoint-1.11bp7
CATEGORIES= misc productivity
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-tfont_c,v 1.1 2009/02/13 13:57:18 giovanni Exp $
--- tfont.c.orig Wed Feb 11 15:48:33 2009
+++ tfont.c Wed Feb 11 15:52:30 2009
@@ -597,8 +597,14 @@ CharToUnicode(code, registry)
if (mgp_charset)
regid = get_regid(mgp_charset) -1;
}
+#ifdef FREETYPE_CHARSET16
+ if (unicode_map[code])
+ code = unicode_map[code];
+#else
if (latin_unicode_map[regid][code])
code = latin_unicode_map[regid][code];
+#endif
+
}
#endif