Mercurial > octave-nkf
changeset 10526:660c244d3206
Don't call text_renderer.set_font if HAVE_FONTCONFIG is not set (bug #29570)
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Fri, 16 Apr 2010 12:45:31 +0200 |
| parents | 3306cfcb856e |
| children | b4d2080b6df7 |
| files | src/ChangeLog src/graphics.cc |
| diffstat | 2 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Apr 16 10:32:07 2010 +0200 +++ b/src/ChangeLog Fri Apr 16 12:45:31 2010 +0200 @@ -1,3 +1,8 @@ +2010-04-13 David Bateman <dbateman@free.fr> + + * 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 <dbateman@free.fr> * DLD-FUNCTIONS/regexp.cc (octregexp_list): Handle repeated matches
--- a/src/graphics.cc Fri Apr 16 10:32:07 2010 +0200 +++ b/src/graphics.cc Fri Apr 16 12:45:31 2010 +0200 @@ -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);