Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
4e4b98e7
Commit
4e4b98e7
authored
May 02, 2013
by
Felix Paul Kühne
Committed by
Jean-Baptiste Kempf
May 19, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
freetype: fixed compilation for non-Mac darwin platforms
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
15efdb9d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
0 deletions
+9
-0
modules/text_renderer/freetype.c
modules/text_renderer/freetype.c
+9
-0
No files found.
modules/text_renderer/freetype.c
View file @
4e4b98e7
...
@@ -103,7 +103,10 @@
...
@@ -103,7 +103,10 @@
/* apple stuff */
/* apple stuff */
#ifdef __APPLE__
#ifdef __APPLE__
#include <TargetConditionals.h>
#if !TARGET_OS_IPHONE
#include <Carbon/Carbon.h>
#include <Carbon/Carbon.h>
#endif
#include <sys/param.h>
/* for MAXPATHLEN */
#include <sys/param.h>
/* for MAXPATHLEN */
#undef HAVE_FONTCONFIG
#undef HAVE_FONTCONFIG
#define HAVE_STYLES
#define HAVE_STYLES
...
@@ -736,6 +739,7 @@ fail:
...
@@ -736,6 +739,7 @@ fail:
#endif
/* HAVE_WIN32 */
#endif
/* HAVE_WIN32 */
#ifdef __APPLE__
#ifdef __APPLE__
#if !TARGET_OS_IPHONE
static
char
*
MacLegacy_Select
(
filter_t
*
p_filter
,
const
char
*
psz_fontname
,
static
char
*
MacLegacy_Select
(
filter_t
*
p_filter
,
const
char
*
psz_fontname
,
bool
b_bold
,
bool
b_italic
,
int
i_size
,
int
*
i_idx
)
bool
b_bold
,
bool
b_italic
,
int
i_size
,
int
*
i_idx
)
{
{
...
@@ -815,6 +819,7 @@ static char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname,
...
@@ -815,6 +819,7 @@ static char* MacLegacy_Select( filter_t *p_filter, const char* psz_fontname,
return
psz_path
;
return
psz_path
;
}
}
#endif
#endif
#endif
#endif
/* HAVE_STYLES */
#endif
/* HAVE_STYLES */
...
@@ -1997,7 +2002,9 @@ static FT_Face LoadFace( filter_t *p_filter,
...
@@ -1997,7 +2002,9 @@ static FT_Face LoadFace( filter_t *p_filter,
-
1
,
-
1
,
&
i_idx
);
&
i_idx
);
#elif defined( __APPLE__ )
#elif defined( __APPLE__ )
#if !TARGET_OS_IPHONE
psz_fontfile
=
MacLegacy_Select
(
p_filter
,
p_style
->
psz_fontname
,
false
,
false
,
-
1
,
&
i_idx
);
psz_fontfile
=
MacLegacy_Select
(
p_filter
,
p_style
->
psz_fontname
,
false
,
false
,
-
1
,
&
i_idx
);
#endif
#elif defined( WIN32 )
#elif defined( WIN32 )
psz_fontfile
=
Win32_Select
(
p_filter
,
psz_fontfile
=
Win32_Select
(
p_filter
,
p_style
->
psz_fontname
,
p_style
->
psz_fontname
,
...
@@ -2911,7 +2918,9 @@ static int Create( vlc_object_t *p_this )
...
@@ -2911,7 +2918,9 @@ static int Create( vlc_object_t *p_this )
false
,
p_sys
->
i_default_font_size
,
false
,
p_sys
->
i_default_font_size
,
&
monofontindex
);
&
monofontindex
);
#elif defined(__APPLE__)
#elif defined(__APPLE__)
#if !TARGET_OS_IPHONE
psz_fontfile
=
MacLegacy_Select
(
p_filter
,
psz_fontfamily
,
false
,
false
,
0
,
&
fontindex
);
psz_fontfile
=
MacLegacy_Select
(
p_filter
,
psz_fontfamily
,
false
,
false
,
0
,
&
fontindex
);
#endif
#elif defined(WIN32)
#elif defined(WIN32)
psz_fontfile
=
Win32_Select
(
p_filter
,
psz_fontfamily
,
false
,
false
,
psz_fontfile
=
Win32_Select
(
p_filter
,
psz_fontfamily
,
false
,
false
,
p_sys
->
i_default_font_size
,
&
fontindex
);
p_sys
->
i_default_font_size
,
&
fontindex
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment