# HG changeset patch # User Kai Habel # Date 1296733625 -3600 # Node ID f103b9c1ca0527e18d9a1b18f27aeb2b4b1a5e16 # Parent f39436e14734bb3bf25a8c234ce3f83e6336e767 use text_renderer object only when freetye is available diff -r f39436e14734 -r f103b9c1ca05 src/ChangeLog --- a/src/ChangeLog Thu Feb 03 01:40:00 2011 -0500 +++ b/src/ChangeLog Thu Feb 03 12:47:05 2011 +0100 @@ -1,3 +1,8 @@ +2011-02-03 Kai Habel + + * src/gl-render.cc(text_to_pixels): Use text_renderer object only + when freetype is available + 2011-02-03 John W. Eaton * ov-base.cc (octave_base_value::as_mxArray): Return 0 silently. diff -r f39436e14734 -r f103b9c1ca05 src/gl-render.cc --- a/src/gl-render.cc Thu Feb 03 01:40:00 2011 -0500 +++ b/src/gl-render.cc Thu Feb 03 12:47:05 2011 +0100 @@ -3214,8 +3214,10 @@ Matrix& bbox, int halign, int valign, double rotation) { +#if HAVE_FREETYPE text_renderer.text_to_pixels (txt, pixels, bbox, halign, valign, rotation); +#endif } Matrix