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

scaled-font: don't store pointer in hash value

Browse source
This commit is contained in:
Adrian Johnson 2016-02-21 09:07:40 +10:30
parent 3538ac3e68
commit 72c9a022ac
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,7 +85,7 @@ static cairo_cache_t cairo_scaled_glyph_page_cache;
#define CAIRO_SCALED_GLYPH_PAGE_SIZE 32
struct _cairo_scaled_glyph_page {
cairo_cache_entry_t cache_entry;
cairo_scaled_font_t *scaled_font;
cairo_list_t link;
unsigned int num_glyphs;
@ -477,7 +477,7 @@ _cairo_scaled_glyph_page_pluck (void *closure)
assert (! cairo_list_is_empty (&page->link));
scaled_font = (cairo_scaled_font_t *) page->cache_entry.hash;
scaled_font = page->scaled_font;
CAIRO_MUTEX_LOCK (scaled_font->mutex);
_cairo_scaled_glyph_page_destroy (scaled_font, page);
@ -2824,7 +2824,7 @@ _cairo_scaled_glyph_page_can_remove (const void *closure)
const cairo_scaled_glyph_page_t *page = closure;
const cairo_scaled_font_t *scaled_font;
scaled_font = (cairo_scaled_font_t *) page->cache_entry.hash;
scaled_font = page->scaled_font;
return scaled_font->cache_frozen == 0;
}
@ -2853,6 +2853,7 @@ _cairo_scaled_font_allocate_glyph (cairo_scaled_font_t *scaled_font,
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
page->cache_entry.hash = (unsigned long) scaled_font;
page->scaled_font = scaled_font;
page->cache_entry.size = 1; /* XXX occupancy weighting? */
page->num_glyphs = 0;