Changeset 076518cb3a3cc4d198e934224ba272b4ddfb9bf9

Timestamp:

21/09/07 03:50:54 (1 year ago)

Author:

Bernie Purcell <bitmap@videolan.org>

git-committer:

Bernie Purcell <bitmap@videolan.org> 1190339454 +0000

git-parent:

[85b3fede801dd88b5211500872455449aa13ed0f]

git-author:

Bernie Purcell <bitmap@videolan.org> 1190339454 +0000

Message:

Fix for problem found by Sebastien Fievet where subtitles weren't
showing up at all due to fontconfig returning empty strings on
font lookup.

Files:

• modules/misc/freetype.c (modified) (2 diffs)

modules/misc/freetype.c

@@ -2372 +2372 @@
-                vlc_mutex_unlock( &p_sys->fontconfig_lock );
-
+                if( psz_fontfile && ! *psz_fontfile )
+                {
+                    msg_Warn( p_filter, "Fontconfig was unable to find a font: \"%s\" %s"
+                        " so using default font", p_style->psz_fontname,
+                        ((p_style->b_bold && p_style->b_italic) ? "(Bold,Italic)" :
+                                               (p_style->b_bold ? "(Bold)" :
+                                             (p_style->b_italic ? "(Italic)" : ""))) );
+                    free( psz_fontfile );
+                    psz_fontfile = NULL;
+                }
+
-                if( psz_fontfile )
-                {
@@ -2603 +2614 @@
-                    {
-                        /* Only text and karaoke tags are supported */
+                        msg_Dbg( p_filter, "Unsupported top-level tag '%s' ignored.", psz_node );
-                        xml_ReaderDelete( p_xml, p_xml_reader );
-                        p_xml_reader = NULL;