Skip to content

V
vlc-1.1
Commit 18cff171 authored by Damien Fouilleul's avatar Damien Fouilleul
Browse files
Options

freetype: make sure fontconfig is still optional

parent c7016c8e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
modules/misc/freetype.c
View file @ 18cff171
...@@ -239,7 +239,9 @@ typedef struct ...@@ -239,7 +239,9 @@ typedef struct
static int Render( filter_t *, subpicture_region_t *, line_desc_t *, int, int); static int Render( filter_t *, subpicture_region_t *, line_desc_t *, int, int);
static void FreeLines( line_desc_t * ); static void FreeLines( line_desc_t * );
static void FreeLine( line_desc_t * ); static void FreeLine( line_desc_t * );
#ifdef HAVE_FONTCONFIG
static void FontBuilder( vlc_object_t *p_this); static void FontBuilder( vlc_object_t *p_this);
#endif
/***************************************************************************** /*****************************************************************************
* filter_sys_t: freetype local data * filter_sys_t: freetype local data
...@@ -463,6 +465,8 @@ static void Destroy( vlc_object_t *p_this ) ...@@ -463,6 +465,8 @@ static void Destroy( vlc_object_t *p_this )
free( p_sys ); free( p_sys );
} }
#ifdef HAVE_FONTCONFIG
static void FontBuilder( vlc_object_t *p_this) static void FontBuilder( vlc_object_t *p_this)
{ {
filter_t *p_filter = (filter_t*)p_this; filter_t *p_filter = (filter_t*)p_this;
...@@ -495,6 +499,8 @@ static void FontBuilder( vlc_object_t *p_this) ...@@ -495,6 +499,8 @@ static void FontBuilder( vlc_object_t *p_this)
vlc_mutex_unlock( &p_sys->fontconfig_lock ); vlc_mutex_unlock( &p_sys->fontconfig_lock );
} }
#endif
/***************************************************************************** /*****************************************************************************
* Make any TTF/OTF fonts present in the attachments of the media file * Make any TTF/OTF fonts present in the attachments of the media file
* and store them for later use by the FreeType Engine * and store them for later use by the FreeType Engine
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment