Mercurial > octave

changeset 28484:6dd150e3c785

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author John W. Eaton <jwe@octave.org>
date Tue, 16 Jun 2020 10:20:47 -0400
parents 98fbb75cd028 (current diff) 98889de398dd (diff)
children 3a05402adef6
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/ft-text-renderer.cc	Mon Jun 15 16:46:51 2020 -0400
+++ b/libinterp/corefcn/ft-text-renderer.cc	Tue Jun 16 10:20:47 2020 -0400
@@ -198,6 +198,7 @@
 
       if (font_map.isempty ())
         {
+#if defined (HAVE_FONTCONFIG)
           FcConfig *config = FcConfigGetCurrent();
           FcPattern *pat = FcPatternCreate ();
           FcObjectSet *os = FcObjectSetBuild (FC_FAMILY, FC_SLANT, FC_WEIGHT,
@@ -269,6 +270,7 @@
               if (fs)
                 FcFontSetDestroy (fs);
             }
+#endif
         }
 
       return font_map;