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

[script] Improve caching of glyph advance

Browse source 
The glyph advance cache was only enabled for glyph indices < 256,
causing a large number of misses for non-ASCII text. Improve this by
simply applying the modulus of the index to select the cache slot - which
may cause some glyph advances to be overwritten and re-queried, but
improves the hit rate.
This commit is contained in:
Chris Wilson 2009-05-27 18:34:54 +01:00
parent 51193f1610
commit 99482b17a5
1 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
util/cairo-script/cairo-script-operators.c
View file

@ -4705,7 +4705,7 @@ _show_glyphs (csi_t *ctx)
double x,y;
csi_integer_t nglyphs, i, j;
double glyph_advance[256][2];
int have_glyph_advance[256];
unsigned long have_glyph_advance[256];
check (2);
@ -4746,7 +4746,7 @@ _show_glyphs (csi_t *ctx)
scaled_font = cairo_get_scaled_font (cr);
nglyphs = 0;
memset (have_glyph_advance, 0, sizeof (have_glyph_advance));
memset (have_glyph_advance, 0xff, sizeof (have_glyph_advance));
x = y = 0;
for (i = 0; i < array->stack.len; i++) {
obj = &array->stack.objects[i];
@ -4755,6 +4755,7 @@ _show_glyphs (csi_t *ctx)
glyph_array = obj->datum.array;
for (j = 0; j < glyph_array->stack.len; j++) {
unsigned long g;
int gi;
cairo_bool_t have_advance;
obj = &glyph_array->stack.objects[j];
@ -4766,35 +4767,23 @@ _show_glyphs (csi_t *ctx)
glyphs[nglyphs].x = x;
glyphs[nglyphs].y = y;
if (g < ARRAY_LENGTH (have_glyph_advance)) {
if (! have_glyph_advance[g]) {
cairo_text_extents_t extents;
cairo_scaled_font_glyph_extents (scaled_font,
&glyphs[nglyphs], 1,
&extents);
glyph_advance[g][0] = extents.x_advance;
glyph_advance[g][1] = extents.y_advance;
have_glyph_advance[g] = TRUE;
}
have_advance = glyph_advance[g][0] != 0.0;
x += glyph_advance[g][0];
y += glyph_advance[g][1];
} else {
gi = g % ARRAY_LENGTH (have_glyph_advance);
if (have_glyph_advance[gi] != g) {
cairo_text_extents_t extents;
cairo_scaled_font_glyph_extents (scaled_font,
&glyphs[nglyphs], 1,
&extents);
have_advance = extents.x_advance != 0.0;
x += extents.x_advance;
y += extents.y_advance;
glyph_advance[gi][0] = extents.x_advance;
glyph_advance[gi][1] = extents.y_advance;
have_glyph_advance[gi] = g;
}
have_advance = glyph_advance[gi][0] != 0.0;
x += glyph_advance[gi][0];
y += glyph_advance[gi][1];
nglyphs += have_advance;
}
break;
@ -4810,7 +4799,7 @@ _show_glyphs (csi_t *ctx)
glyphs[nglyphs].x = x;
glyphs[nglyphs].y = y;
if (! have_glyph_advance[g]) {
if (have_glyph_advance[g] != g) {
cairo_text_extents_t extents;
cairo_scaled_font_glyph_extents (scaled_font,
@ -4819,7 +4808,7 @@ _show_glyphs (csi_t *ctx)
glyph_advance[g][0] = extents.x_advance;
glyph_advance[g][1] = extents.y_advance;
have_glyph_advance[g] = TRUE;
have_glyph_advance[g] = g;
}
have_advance = glyph_advance[g][0] != 0.0;