Commit f2ca5228 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

quartztext: Fixup.

parent c3e49077
...@@ -37,10 +37,12 @@ ...@@ -37,10 +37,12 @@
#include <vlc_input.h> #include <vlc_input.h>
#include <Availability.h> #include <Availability.h>
#ifdef TARGET_OS_IPHONE
#include <CoreText/CoreText.h> #include <CoreText/CoreText.h>
#include <CoreGraphics/CoreGraphics.h> #include <CoreGraphics/CoreGraphics.h>
#if !TARGET_OS_IPHONE #else
// Fix ourselves ColorSync headers that gets included in ApplicationServices. // Fix ourselves ColorSync headers that gets included in ApplicationServices.
#define DisposeCMProfileIterateUPP(a) DisposeCMProfileIterateUPP(CMProfileIterateUPP userUPP __attribute__((unused))) #define DisposeCMProfileIterateUPP(a) DisposeCMProfileIterateUPP(CMProfileIterateUPP userUPP __attribute__((unused)))
#define DisposeCMMIterateUPP(a) DisposeCMMIterateUPP(CMProfileIterateUPP userUPP __attribute__((unused))) #define DisposeCMMIterateUPP(a) DisposeCMMIterateUPP(CMProfileIterateUPP userUPP __attribute__((unused)))
...@@ -171,7 +173,7 @@ struct filter_sys_t ...@@ -171,7 +173,7 @@ struct filter_sys_t
int i_font_color; int i_font_color;
int i_font_size; int i_font_size;
#if !TARGET_OS_IPHONE #ifndef TARGET_OS_IPHONE
ATSFontContainerRef *p_fonts; ATSFontContainerRef *p_fonts;
int i_fonts; int i_fonts;
#endif #endif
...@@ -199,7 +201,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -199,7 +201,7 @@ static int Create( vlc_object_t *p_this )
p_filter->pf_render_text = RenderText; p_filter->pf_render_text = RenderText;
p_filter->pf_render_html = RenderHtml; p_filter->pf_render_html = RenderHtml;
#if !TARGET_OS_IPHONE #ifndef TARGET_OS_IPHONE
p_sys->p_fonts = NULL; p_sys->p_fonts = NULL;
p_sys->i_fonts = 0; p_sys->i_fonts = 0;
#endif #endif
...@@ -218,7 +220,7 @@ static void Destroy( vlc_object_t *p_this ) ...@@ -218,7 +220,7 @@ static void Destroy( vlc_object_t *p_this )
{ {
filter_t *p_filter = (filter_t *)p_this; filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys; filter_sys_t *p_sys = p_filter->p_sys;
#if !TARGET_OS_IPHONE #ifndef TARGET_OS_IPHONE
if( p_sys->p_fonts ) if( p_sys->p_fonts )
{ {
int k; int k;
...@@ -241,7 +243,7 @@ static void Destroy( vlc_object_t *p_this ) ...@@ -241,7 +243,7 @@ static void Destroy( vlc_object_t *p_this )
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
static int LoadFontsFromAttachments( filter_t *p_filter ) static int LoadFontsFromAttachments( filter_t *p_filter )
{ {
#if TARGET_OS_IPHONE #ifdef TARGET_OS_IPHONE
VLC_UNUSED(p_filter); VLC_UNUSED(p_filter);
return VLC_SUCCESS; return VLC_SUCCESS;
#else #else
......
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