sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

only warn if fontfile load fails

Browse Source 
since it can fail for things like adding the same font twice from
different files

thanks molfar

see https://github.com/libvips/libvips/issues/2220
This commit is contained in:
John Cupitt 2021-04-22 15:27:18 +01:00
parent fa6e403d30
commit ee2255da00
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libvips/create/text.c
View File

@ -126,12 +126,10 @@ static GMutex *vips_text_lock = NULL;
*/ */
static PangoFontMap *vips_text_fontmap = NULL; static PangoFontMap *vips_text_fontmap = NULL;
#ifdef HAVE_FONTCONFIG
/* All the fontfiles we've loaded. fontconfig lets you add a fontfile /* All the fontfiles we've loaded. fontconfig lets you add a fontfile
* repeatedly, and we obviously don't want that. * repeatedly, and we obviously don't want that.
*/ */
static GHashTable *vips_text_fontfiles = NULL; static GHashTable *vips_text_fontfiles = NULL;
#endif
static void static void
vips_text_dispose( GObject *gobject ) vips_text_dispose( GObject *gobject )
@ -371,11 +369,9 @@ vips_text_build( VipsObject *object )
if( !vips_text_fontmap ) if( !vips_text_fontmap )
vips_text_fontmap = pango_cairo_font_map_new(); vips_text_fontmap = pango_cairo_font_map_new();
#ifdef HAVE_FONTCONFIG
if( !vips_text_fontfiles ) if( !vips_text_fontfiles )
vips_text_fontfiles = vips_text_fontfiles =
g_hash_table_new( g_str_hash, g_str_equal ); g_hash_table_new( g_str_hash, g_str_equal );
#endif
text->context = pango_font_map_create_context( text->context = pango_font_map_create_context(
PANGO_FONT_MAP( vips_text_fontmap ) ); PANGO_FONT_MAP( vips_text_fontmap ) );
@ -383,23 +379,22 @@ vips_text_build( VipsObject *object )
#ifdef HAVE_FONTCONFIG #ifdef HAVE_FONTCONFIG
if( text->fontfile && if( text->fontfile &&
!g_hash_table_lookup( vips_text_fontfiles, text->fontfile ) ) { !g_hash_table_lookup( vips_text_fontfiles, text->fontfile ) ) {
/* This can fail if you eg. add the same font from two
* different files. Just warn.
*/
if( !FcConfigAppFontAddFile( NULL, if( !FcConfigAppFontAddFile( NULL,
(const FcChar8 *) text->fontfile ) ) { (const FcChar8 *) text->fontfile ) )
vips_error( class->nickname, g_warning( _( "unable to load fontfile \"%s\"" ),
_( "unable to load font \"%s\"" ),
text->fontfile ); text->fontfile );
g_mutex_unlock( vips_text_lock );
return( -1 );
}
g_hash_table_insert( vips_text_fontfiles, g_hash_table_insert( vips_text_fontfiles,
text->fontfile, text->fontfile,
g_strdup( text->fontfile ) ); g_strdup( text->fontfile ) );
} }
#else #else /*!HAVE_FONTCONFIG*/
if( text->fontfile ) if( text->fontfile )
g_warning( "%s", g_warning( "%s",
_( "ignoring fontfile (no fontconfig support)" ) ); _( "ignoring fontfile (no fontconfig support)" ) );
#endif #endif /*HAVE_FONTCONFIG*/
/* If our caller set height and not dpi, we adjust dpi until /* If our caller set height and not dpi, we adjust dpi until
* we get a fit. * we get a fit.