Mercurial > hg > octave-thorsten

changeset 12305:f8891edcfd35 release-3-4-x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
txt-eng-ft.cc (ft_manager::ft_manager): omit fc_init_done from init list if fontconfig is missing
author John W. Eaton <jwe@octave.org>
date Sun, 30 Jan 2011 12:01:35 -0500
parents c16ce72e0a22
children eedeed3ee849
files src/ChangeLog src/txt-eng-ft.cc
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-30  John W. Eaton  <jwe@octave.org>
+
+	* txt-eng-ft.cc (ft_manager::ft_manager): Omit fc_init_done from
+	initialization list if fontconfig is missing.
+
 2011-01-30  Pascal Dupuis  <Pascal.Dupuis@worldonline.be>
 
 	* oct-parse.yy (class stdio_stream_reader): Disallow copying.
--- a/src/txt-eng-ft.cc
+++ b/src/txt-eng-ft.cc
@@ -75,7 +75,10 @@
 
   ft_manager& operator = (const ft_manager&);
 
-  ft_manager (void) : library (), fc_init_done (false)
+  ft_manager (void) : library ()
+#if HAVE_FONTCONFIG
+    , fc_init_done (false)
+#endif
     {
       if (FT_Init_FreeType (&library))
         {