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
0c76db2e
Commit
0c76db2e
authored
Oct 25, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Freetype: fix Android miscompilation
parent
4e55554c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
modules/text_renderer/platform_fonts.c
modules/text_renderer/platform_fonts.c
+12
-12
No files found.
modules/text_renderer/platform_fonts.c
View file @
0c76db2e
...
...
@@ -1405,18 +1405,6 @@ static int Android_ParseFamily( filter_t *p_filter, xml_reader_t *p_xml )
return
VLC_EGENERIC
;
}
int
Android_Prepare
(
filter_t
*
p_filter
)
{
if
(
Android_ParseSystemFonts
(
p_filter
,
ANDROID_SYSTEM_FONTS
)
==
VLC_ENOMEM
)
return
VLC_EGENERIC
;
if
(
Android_ParseSystemFonts
(
p_filter
,
ANDROID_FALLBACK_FONTS
)
==
VLC_ENOMEM
)
return
VLC_EGENERIC
;
if
(
Android_ParseSystemFonts
(
p_filter
,
ANDROID_VENDOR_FONTS
)
==
VLC_ENOMEM
)
return
VLC_EGENERIC
;
return
VLC_SUCCESS
;
}
static
int
Android_ParseSystemFonts
(
filter_t
*
p_filter
,
const
char
*
psz_path
)
{
int
i_ret
=
VLC_SUCCESS
;
...
...
@@ -1449,6 +1437,18 @@ static int Android_ParseSystemFonts( filter_t *p_filter, const char *psz_path )
return
i_ret
;
}
int
Android_Prepare
(
filter_t
*
p_filter
)
{
if
(
Android_ParseSystemFonts
(
p_filter
,
ANDROID_SYSTEM_FONTS
)
==
VLC_ENOMEM
)
return
VLC_EGENERIC
;
if
(
Android_ParseSystemFonts
(
p_filter
,
ANDROID_FALLBACK_FONTS
)
==
VLC_ENOMEM
)
return
VLC_EGENERIC
;
if
(
Android_ParseSystemFonts
(
p_filter
,
ANDROID_VENDOR_FONTS
)
==
VLC_ENOMEM
)
return
VLC_EGENERIC
;
return
VLC_SUCCESS
;
}
const
vlc_family_t
*
Android_GetFamily
(
filter_t
*
p_filter
,
const
char
*
psz_family
)
{
filter_sys_t
*
p_sys
=
p_filter
->
p_sys
;
...
...
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