summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2009-08-22 18:48:33 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2009-08-29 17:07:37 +0100
commitfcda9fc2f29c2ee7d0bb45c17a2261badfdf430c (patch)
treed756ec94b2015a740d74bcfedc3e6a9605dcf628
parent93cfa7376fb505e676d113e8ef431bab9b497f56 (diff)
[scaled-font] Remove assert from cairo_scled_font_create()
The assert() is only correct for the normal paths, but failed on the error path. It has been run for long enough for me to be confident that the code is self-consistent, so I think I can now safely remove it.
-rw-r--r--src/cairo-scaled-font.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index d8406f77..9280f725 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -947,6 +947,10 @@ cairo_scaled_font_create (cairo_font_face_t *font_face,
ctm,
options);
}
+
+ _cairo_scaled_font_init_key (&key, font_face,
+ font_matrix, ctm, options);
+
}
else
{
@@ -1049,7 +1053,6 @@ cairo_scaled_font_create (cairo_font_face_t *font_face,
scaled_font->original_font_face =
cairo_font_face_reference (original_font_face);
- assert (scaled_font->hash_entry.hash == key.hash_entry.hash);
status = _cairo_hash_table_insert (font_map->hash_table,
&scaled_font->hash_entry);
if (likely (status == CAIRO_STATUS_SUCCESS)) {