Mercurial > hg > octave-lyh

changeset 12333:f103b9c1ca05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use text_renderer object only when freetye is available
author Kai Habel <kai.habel@gmx.de>
date Thu, 03 Feb 2011 12:47:05 +0100
parents f39436e14734
children 63dc132a1000
files src/ChangeLog src/gl-render.cc
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-03  Kai Habel  <kai.habel@gmx.de>
+
+	* src/gl-render.cc(text_to_pixels): Use text_renderer object only
+	when freetype is available
+
 2011-02-03  John W. Eaton  <jwe@octave.org>
 
 	* ov-base.cc (octave_base_value::as_mxArray): Return 0 silently.
--- a/src/gl-render.cc
+++ b/src/gl-render.cc
@@ -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