Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
aa1a73ef
Commit
aa1a73ef
authored
Dec 01, 2015
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
freetype: remote non-needed default list initialization for Darwin
parent
f76cbf5f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
10 deletions
+0
-10
modules/text_renderer/freetype/freetype.c
modules/text_renderer/freetype/freetype.c
+0
-10
No files found.
modules/text_renderer/freetype/freetype.c
View file @
aa1a73ef
...
@@ -44,7 +44,6 @@
...
@@ -44,7 +44,6 @@
/* apple stuff */
/* apple stuff */
#ifdef __APPLE__
#ifdef __APPLE__
# include <TargetConditionals.h>
# undef HAVE_FONTCONFIG
# undef HAVE_FONTCONFIG
# define HAVE_GET_FONT_BY_FAMILY_NAME
# define HAVE_GET_FONT_BY_FAMILY_NAME
#endif
#endif
...
@@ -1263,18 +1262,9 @@ static int Create( vlc_object_t *p_this )
...
@@ -1263,18 +1262,9 @@ static int Create( vlc_object_t *p_this )
p_sys
->
pf_get_fallbacks
=
FontConfig_GetFallbacks
;
p_sys
->
pf_get_fallbacks
=
FontConfig_GetFallbacks
;
FontConfig_Prepare
(
p_filter
);
FontConfig_Prepare
(
p_filter
);
#elif defined( __APPLE__ )
#elif defined( __APPLE__ )
#if TARGET_OS_IPHONE
const
char
*
const
ppsz_darwin_default
[]
=
{
"Helvetica Neue"
,
"Arial"
,
"Heiti SC"
,
"Heiti TC"
,
"Hiragino Mincho ProN"
,
"Malayalam Sangam MN"
};
#else
const
char
*
const
ppsz_darwin_default
[]
=
{
"Helvetica Neue"
,
"Arial"
,
"Heiti SC"
,
"Heiti TC"
,
"GungSeo"
,
"Arial Unicode MS"
,
"Malayalam Sangam MN"
};
#endif
p_sys
->
pf_select
=
Generic_Select
;
p_sys
->
pf_select
=
Generic_Select
;
p_sys
->
pf_get_family
=
CoreText_GetFamily
;
p_sys
->
pf_get_family
=
CoreText_GetFamily
;
p_sys
->
pf_get_fallbacks
=
CoreText_GetFallbacks
;
p_sys
->
pf_get_fallbacks
=
CoreText_GetFallbacks
;
InitDefaultList
(
p_filter
,
ppsz_darwin_default
,
sizeof
(
ppsz_darwin_default
)
/
sizeof
(
*
ppsz_darwin_default
)
);
#elif defined( _WIN32 ) && defined( HAVE_GET_FONT_BY_FAMILY_NAME )
#elif defined( _WIN32 ) && defined( HAVE_GET_FONT_BY_FAMILY_NAME )
const
char
*
const
ppsz_win32_default
[]
=
const
char
*
const
ppsz_win32_default
[]
=
{
"Tahoma"
,
"FangSong"
,
"SimHei"
,
"KaiTi"
};
{
"Tahoma"
,
"FangSong"
,
"SimHei"
,
"KaiTi"
};
...
...
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