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

[surface] Only copy font options if the target surface has them.

Browse source 
No need to copy font options if the similar surface is from the same
backend and no special options have been applied by the user. Doing so
breaks lazy initialisation of backend specific options.
This commit is contained in:
Chris Wilson 2008-10-24 09:00:45 +01:00
parent a002375810
commit d5543005e7
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/cairo-surface.c
View file

@ -229,9 +229,6 @@ _cairo_surface_create_similar_scratch (cairo_surface_t *other,
int height)
{
cairo_surface_t *surface = NULL;
cairo_font_options_t options;
cairo_format_t format = _cairo_format_from_content (content);
if (other->status)
return _cairo_surface_create_in_error (other->status);
@ -242,15 +239,22 @@ _cairo_surface_create_similar_scratch (cairo_surface_t *other,
return surface;
}
if (surface == NULL)
surface = cairo_image_surface_create (format, width, height);
if (surface == NULL) {
surface =
cairo_image_surface_create (_cairo_format_from_content (content),
width, height);
}
/* If any error occurred, then return the nil surface we received. */
if (surface->status)
return surface;
cairo_surface_get_font_options (other, &options);
_cairo_surface_set_font_options (surface, &options);
if (other->has_font_options || other->backend != surface->backend) {
cairo_font_options_t options;
cairo_surface_get_font_options (other, &options);
_cairo_surface_set_font_options (surface, &options);
}
cairo_surface_set_fallback_resolution (surface,
other->x_fallback_resolution,