comparison 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
comparison
equal deleted inserted replaced
5921:68639fb08af8 5922:4b055de36bb9
142 and must be internal format (eg, pure ASCII) 142 and must be internal format (eg, pure ASCII)
143 PATTERN is an FcPattern *. */ 143 PATTERN is an FcPattern *. */
144 #define PRINT_XFT_PATTERN(level,format,pattern) \ 144 #define PRINT_XFT_PATTERN(level,format,pattern) \
145 do { \ 145 do { \
146 DECLARE_EISTRING (eistrpxft_name); \ 146 DECLARE_EISTRING (eistrpxft_name); \
147 Extbyte *name = (Extbyte *) FcNameUnparse (pattern); \ 147 Extbyte *name; \
148 \ 148 FcPattern* temp = FcPatternDuplicate (pattern); \
149 FcPatternDel (temp, FC_CHARSET); \
150 name = (Extbyte *) FcNameUnparse (temp); \
151 FcPatternDestroy (temp); \
149 eicpy_ext(eistrpxft_name, \ 152 eicpy_ext(eistrpxft_name, \
150 name ? name : "FONT WITH NULL NAME", \ 153 name ? name : "FONT WITH NULL NAME", \
151 Qfc_font_name_encoding); \ 154 Qfc_font_name_encoding); \
152 DEBUG_XFT1 (level, format, eidata(eistrpxft_name)); \ 155 DEBUG_XFT1 (level, format, eidata(eistrpxft_name)); \
153 free (name); \ 156 free (name); \