fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2025-12-26 06:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[replay] Take advantage of unresolved fonts

Browse source 
As Behdad has changed the underlying ft-font to accept unresolved patterns,
take advantage of that to simplify the replay code.
This commit is contained in:
Chris Wilson 2008-12-17 23:45:39 +00:00
parent 97a00bdd4e
commit 0df43251d4
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
util/cairo-script/cairo-script-operators.c
View file

@ -1628,8 +1628,7 @@ _ft_create_for_pattern (csi_t *ctx,
struct _ft_face_data *data;
csi_list_t *link;
cairo_font_face_t *font_face;
FcPattern *pattern, *resolved;
FcResult result;
FcPattern *pattern;
csi_status_t status;
_csi_blob_init (&tmpl, (uint8_t *) string->string, string->len);
@ -1646,18 +1645,7 @@ _ft_create_for_pattern (csi_t *ctx,
if (_csi_unlikely (pattern == NULL))
return _csi_error (CSI_STATUS_NO_MEMORY);
FcConfigSubstitute (NULL, pattern, FcMatchPattern);
FcDefaultSubstitute (pattern);
resolved = FcFontMatch (NULL, pattern, &result);
if (_csi_unlikely (resolved == NULL)) {
FcPatternDestroy (pattern);
return _csi_error (CSI_STATUS_NO_MEMORY);
}
font_face = cairo_ft_font_face_create_for_pattern (resolved);
FcPatternDestroy (resolved);
font_face = cairo_ft_font_face_create_for_pattern (pattern);
FcPatternDestroy (pattern);
data = _csi_slab_alloc (ctx, sizeof (*data));