diff src/font-mgr.h @ 5922:4b055de36bb9 cygwin

merging heads 2
author Henry Thompson <ht@markup.co.uk>
date Fri, 27 Feb 2015 17:47:15 +0000
parents 6928877dbc26
children
line wrap: on
line diff
--- a/src/font-mgr.h	Wed Apr 23 22:22:37 2014 +0100
+++ b/src/font-mgr.h	Fri Feb 27 17:47:15 2015 +0000
@@ -144,8 +144,11 @@
 #define PRINT_XFT_PATTERN(level,format,pattern)			\
   do {								\
     DECLARE_EISTRING (eistrpxft_name);				\
-    Extbyte *name = (Extbyte *) FcNameUnparse (pattern);	\
-								\
+    Extbyte *name;						\
+    FcPattern* temp = FcPatternDuplicate (pattern);		\
+    FcPatternDel (temp, FC_CHARSET);				\
+    name = (Extbyte *) FcNameUnparse (temp);			\
+    FcPatternDestroy (temp);					\
     eicpy_ext(eistrpxft_name,					\
               name ? name : "FONT WITH NULL NAME",		\
               Qfc_font_name_encoding);				\