# HG changeset patch # User David Bateman # Date 1271414731 -7200 # Node ID 660c244d3206ebbf9261416b202bd2bf15642502 # Parent 3306cfcb856e3824b7bdb9e87e8b9719ade07f7d Don't call text_renderer.set_font if HAVE_FONTCONFIG is not set (bug #29570) diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-04-13 David Bateman + + * graphics.cc (void text::properties::update_text_extent (void)): + Don't call text_renderer.set_font if HAVE_FONTCONFIG is not set. + 2010-04-13 David Bateman * DLD-FUNCTIONS/regexp.cc (octregexp_list): Handle repeated matches diff --git a/src/graphics.cc b/src/graphics.cc --- a/src/graphics.cc +++ b/src/graphics.cc @@ -4245,7 +4245,9 @@ // FIXME: parsed content should be cached for efficiency elt = text_parser_none ().parse (get_string ()); +#ifdef HAVE_FONTCONFIG text_renderer.set_font (*this); +#endif box = text_renderer.get_extent (elt, get_rotation ()); Matrix extent (1, 4, 0.0);