From 1f794f6f3032abca4f7b3418c360eac9744afcb4 Mon Sep 17 00:00:00 2001 From: Cristy Date: Mon, 11 Jun 2018 19:07:19 -0400 Subject: [PATCH] Refactor fontconfig API initialization --- MagickCore/type.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/MagickCore/type.c b/MagickCore/type.c index 21ebadb21..020b16ff8 100644 --- a/MagickCore/type.c +++ b/MagickCore/type.c @@ -726,6 +726,9 @@ MagickExport MagickBooleanType LoadFontConfigFonts(SplayTreeInfo *type_cache, extension[MagickPathExtent], name[MagickPathExtent]; + FcBool + result; + FcChar8 *family, *file, @@ -762,9 +765,13 @@ MagickExport MagickBooleanType LoadFontConfigFonts(SplayTreeInfo *type_cache, Load system fonts. */ (void) exception; - font_config=FcInitLoadConfigAndFonts(); + result=FcInit(); + if (result == 0) + return(MagickFalse); + font_config=FcConfigGetCurrent(); if (font_config == (FcConfig *) NULL) return(MagickFalse); + FcConfigSetRescanInterval(font_config,0); font_set=(FcFontSet *) NULL; object_set=FcObjectSetBuild(FC_FULLNAME,FC_FAMILY,FC_STYLE,FC_SLANT, FC_WIDTH,FC_WEIGHT,FC_FILE,(char *) NULL); @@ -773,7 +780,7 @@ MagickExport MagickBooleanType LoadFontConfigFonts(SplayTreeInfo *type_cache, pattern=FcPatternCreate(); if (pattern != (FcPattern *) NULL) { - font_set=FcFontList(0,pattern,object_set); + font_set=FcFontList(font_config,pattern,object_set); FcPatternDestroy(pattern); } FcObjectSetDestroy(object_set); -- 2.40.0