# HG changeset patch # User Kai Habel # Date 1296733625 -3600 # Node ID 3458c5bba6e58dd2f303de0c0299531e59c24765 # Parent 4f4eb7da82d56b0013e63e2006b60e6873122355 use text_renderer object only when freetye is available diff -r 4f4eb7da82d5 -r 3458c5bba6e5 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 4f4eb7da82d5 -r 3458c5bba6e5 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