fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-04-19 19:30:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'scaled-font-options' into 'master'

Browse source 
[scaled-font] Clean up font-options before copy

See merge request cairo/cairo!415
This commit is contained in:
Behdad Esfahbod 2023-01-19 21:19:41 +00:00
commit 45a1317aa4
4 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cairo-scaled-font.c
View file

@ -3073,6 +3073,7 @@ cairo_scaled_font_get_font_options (cairo_scaled_font_t *scaled_font,
return;
}
_cairo_font_options_fini (options);
_cairo_font_options_init_copy (options, &scaled_font->options);
}
slim_hidden_def (cairo_scaled_font_get_font_options);

1
src/cairo-script-surface.c
View file

@ -3044,6 +3044,7 @@ _emit_scaled_font (cairo_script_surface_t *surface,
if (unlikely (status))
return status;
_cairo_font_options_init_default (&options);
cairo_scaled_font_get_font_options (scaled_font, &options);
status = _emit_font_options (surface, &options);
if (unlikely (status))

1
src/cairo-surface.c
View file

@ -2757,6 +2757,7 @@ composite_color_glyphs (cairo_surface_t *surface,
font_face = cairo_scaled_font_get_font_face (scaled_font);
cairo_scaled_font_get_font_matrix (scaled_font, &font_matrix);
cairo_scaled_font_get_ctm (scaled_font, &ctm);
_cairo_font_options_init_default (&font_options);
cairo_scaled_font_get_font_options (scaled_font, &font_options);
cairo_matrix_scale (&ctm, x_scale, y_scale);
scaled_font = cairo_scaled_font_create (font_face,

1
src/win32/cairo-dwrite-font.cpp
View file

@ -1883,6 +1883,7 @@ _cairo_dwrite_scaled_font_create_win32_scaled_font (cairo_scaled_font_t *scaled_
cairo_scaled_font_get_ctm (scaled_font, &ctm);
cairo_font_options_t options;
_cairo_font_options_init_default (&options);
cairo_scaled_font_get_font_options (scaled_font, &options);
cairo_scaled_font_t *font = cairo_scaled_font_create (win32_face,