fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 14:38:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'colrv1-stack-variable' into 'master'

Browse source 
[COLRv1] Allocate context variable on the stack

See merge request cairo/cairo!410
This commit is contained in:
Adrian Johnson 2023-01-17 20:26:50 +00:00
commit 2c557d7cea
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/cairo-colr-glyph-render.c
View file

@ -1192,7 +1192,7 @@ _cairo_render_colr_v1_glyph (FT_Face face,
cairo_t *cr)
{
cairo_status_t status = CAIRO_STATUS_SUCCESS;
cairo_colr_glyph_render_t *colr_render = NULL;
cairo_colr_glyph_render_t colr_render;
FT_Color *palette = NULL;
FT_Palette_Data palette_data;
@ -1200,12 +1200,6 @@ _cairo_render_colr_v1_glyph (FT_Face face,
printf ("_cairo_render_colr_glyph glyph index: %ld\n", glyph);
#endif
colr_render = _cairo_malloc (sizeof (cairo_colr_glyph_render_t));
if (unlikely (colr_render == NULL)) {
status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
goto cleanup;
}
if (FT_Palette_Data_Get (face, &palette_data) == 0 && palette_data.num_palettes > 0) {
if (palette_index >= palette_data.num_palettes)
palette_index = CAIRO_COLOR_PALETTE_DEFAULT;
@ -1214,22 +1208,18 @@ _cairo_render_colr_v1_glyph (FT_Face face,
palette = NULL;
}
colr_render->face = face;
colr_render->palette = palette;
colr_render->num_palette_entries = palette_data.num_palette_entries;
colr_render->foreground_color = cairo_pattern_reference (cairo_get_source (cr));
colr_render->level = 0;
colr_render.face = face;
colr_render.palette = palette;
colr_render.num_palette_entries = palette_data.num_palette_entries;
colr_render.foreground_color = cairo_pattern_reference (cairo_get_source (cr));
colr_render.level = 0;
status = draw_colr_glyph (colr_render,
status = draw_colr_glyph (&colr_render,
glyph,
FT_COLOR_INCLUDE_ROOT_TRANSFORM,
cr);
cleanup:
cairo_pattern_destroy (colr_render->foreground_color);
if (colr_render)
free (colr_render);
cairo_pattern_destroy (colr_render.foreground_color);
return status;
}