summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Johnson <ajohnson@redneon.com>2008-08-10 14:18:52 +0930
committerAdrian Johnson <ajohnson@redneon.com>2008-08-10 14:18:52 +0930
commitb34c248b92b2d1544a23c20ecaa12f64792cb1d3 (patch)
treeb9d79814c376d0fb4f373675cbba0a3a442ebb33
parentd1c619bc7d51a8e96eaf391691bec142dbd34e0e (diff)
downloadcairo-b34c248b92b2d1544a23c20ecaa12f64792cb1d3.tar.gz
Fix _cairo_sub_font_map_glyph() to return correct unicode value
-rw-r--r--src/cairo-scaled-font-subsets.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c
index 2740d631c..1f87838be 100644
--- a/src/cairo-scaled-font-subsets.c
+++ b/src/cairo-scaled-font-subsets.c
@@ -460,10 +460,9 @@ _cairo_sub_font_map_glyph (cairo_sub_font_t *sub_font,
if (sub_font_glyph == NULL)
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
- if (utf8_len < 0)
- _cairo_sub_font_glyph_lookup_unicode (sub_font_glyph,
- sub_font->scaled_font,
- scaled_font_glyph_index);
+ _cairo_sub_font_glyph_lookup_unicode (sub_font_glyph,
+ sub_font->scaled_font,
+ scaled_font_glyph_index);
status = _cairo_hash_table_insert (sub_font->sub_font_glyphs, &sub_font_glyph->base);
if (status) {
@@ -493,6 +492,7 @@ _cairo_sub_font_map_glyph (cairo_sub_font_t *sub_font,
subset_glyph->x_advance = sub_font_glyph->x_advance;
subset_glyph->y_advance = sub_font_glyph->y_advance;
subset_glyph->utf8_is_mapped = _cairo_sub_font_glyph_map_to_unicode (sub_font_glyph, utf8, utf8_len);
+ subset_glyph->unicode = sub_font_glyph->unicode;
return CAIRO_STATUS_SUCCESS;
}