diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2023-01-19 11:39:36 -0700 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2023-01-19 13:42:23 -0700 |
commit | 8fbfb7f3770c42ad050c2b7ac77dd345e6b5eeab (patch) | |
tree | 65828cbd273bb251c42d377002e2aea558127e6a | |
parent | 7b1de369ddace078c2ffc8b0bde211c5c3eeb810 (diff) | |
download | cairo-8fbfb7f3770c42ad050c2b7ac77dd345e6b5eeab.tar.gz |
[scaled-font] Clean up font-options before copy
-rwxr-xr-x | src/cairo-scaled-font.c | 1 | ||||
-rw-r--r-- | src/cairo-script-surface.c | 1 | ||||
-rw-r--r-- | src/cairo-surface.c | 1 | ||||
-rw-r--r-- | src/win32/cairo-dwrite-font.cpp | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c index 83f1e1eed..cc52ed577 100755 --- a/src/cairo-scaled-font.c +++ b/src/cairo-scaled-font.c @@ -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); diff --git a/src/cairo-script-surface.c b/src/cairo-script-surface.c index 2baf873de..058626321 100644 --- a/src/cairo-script-surface.c +++ b/src/cairo-script-surface.c @@ -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)) diff --git a/src/cairo-surface.c b/src/cairo-surface.c index fd661221b..942e2025c 100644 --- a/src/cairo-surface.c +++ b/src/cairo-surface.c @@ -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, diff --git a/src/win32/cairo-dwrite-font.cpp b/src/win32/cairo-dwrite-font.cpp index 03f1668d3..764835bc8 100644 --- a/src/win32/cairo-dwrite-font.cpp +++ b/src/win32/cairo-dwrite-font.cpp @@ -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, |