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

Disable font options for xcb.

Browse source 
This patch makes a bunch of tests pass again. The first hunk one fixes a
shameful oversight (whoops), the second one effectively reverts
e691d242.  That change broke 102 xcb and 70 xlib tests, including a
bunch of *twin-antialias-* test cases.  Patch thanks to Uli Schlachter.

Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
This commit is contained in:
Bryce Harrington 2014-09-17 17:14:01 -07:00
parent 0aa43ed886
commit e0c0a673ee
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cairo-xcb-screen.c
View file

@ -242,6 +242,7 @@ _cairo_xcb_screen_get (xcb_connection_t *xcb_connection,
screen->connection = connection;
screen->xcb_screen = xcb_screen;
screen->has_font_options = FALSE;
_cairo_freelist_init (&screen->pattern_cache_entry_freelist,
sizeof (struct pattern_cache_entry));
@ -460,7 +461,12 @@ _cairo_xcb_screen_get_font_options (cairo_xcb_screen_t *screen)
_cairo_font_options_init_default (&screen->font_options);
_cairo_font_options_set_round_glyph_positions (&screen->font_options, CAIRO_ROUND_GLYPH_POS_ON);
if (! _cairo_xcb_connection_acquire (screen->connection)) {
/* XXX: This is disabled because something seems to be merging
font options incorrectly for xcb. This effectively reverts
the changes brought in git e691d242, and restores ~150 tests
to resume passing. See mailing list archives for Sep 17,
2014 for more discussion. */
if (0 && ! _cairo_xcb_connection_acquire (screen->connection)) {
_cairo_xcb_init_screen_font_options (screen);
_cairo_xcb_connection_release (screen->connection);
}