| … | |
… | |
| 70 | NULL); |
70 | NULL); |
| 71 | |
71 | |
| 72 | if (FcPatternGetDouble (pattern, FC_PIXEL_SIZE, 0, &d) == FcResultMatch) |
72 | if (FcPatternGetDouble (pattern, FC_PIXEL_SIZE, 0, &d) == FcResultMatch) |
| 73 | font->size = d * PANGO_SCALE; |
73 | font->size = d * PANGO_SCALE; |
| 74 | |
74 | |
|
|
75 | /* pango 1.24 is ABI-incompatible with 1.22, but distros */ |
|
|
76 | /* usually package it under the same name, so a runtime check */ |
|
|
77 | /* is required */ |
|
|
78 | if (pango_version () > PANGO_VERSION_ENCODE (1, 23, 0)) |
|
|
79 | PANGO_FC_FONT (font)->fontmap = fontmap; |
|
|
80 | |
| 75 | return font; |
81 | return font; |
| 76 | } |
82 | } |
| 77 | |
83 | |
| 78 | static void |
84 | static void |
| 79 | load_fallback_face (PangoOpenGLFont *font, const char *original_file) |
85 | load_fallback_face (PangoOpenGLFont *font, const char *original_file) |
| … | |
… | |
| 100 | if (FcPatternGetInteger (matched, FC_INDEX, 0, &id) != FcResultMatch) |
106 | if (FcPatternGetInteger (matched, FC_INDEX, 0, &id) != FcResultMatch) |
| 101 | goto bail1; |
107 | goto bail1; |
| 102 | |
108 | |
| 103 | error = FT_New_Face (_pango_opengl_font_map_get_library (fcfont->fontmap), |
109 | error = FT_New_Face (_pango_opengl_font_map_get_library (fcfont->fontmap), |
| 104 | (char *) filename2, id, &font->face); |
110 | (char *) filename2, id, &font->face); |
| 105 | |
|
|
| 106 | |
111 | |
| 107 | if (error) |
112 | if (error) |
| 108 | { |
113 | { |
| 109 | bail1: |
114 | bail1: |
| 110 | name = pango_font_description_to_string (fcfont->description); |
115 | name = pango_font_description_to_string (fcfont->description); |
