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
dacf900c
Commit
dacf900c
authored
Mar 06, 2014
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Freetype: allow to pass a font on WinRT
parent
6e8199aa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
modules/text_renderer/freetype.c
modules/text_renderer/freetype.c
+4
-2
modules/text_renderer/platform_fonts.c
modules/text_renderer/platform_fonts.c
+1
-1
No files found.
modules/text_renderer/freetype.c
View file @
dacf900c
...
...
@@ -71,7 +71,9 @@
/* Win32 */
#ifdef _WIN32
# undef HAVE_FONTCONFIG
# define HAVE_GET_FONT_BY_FAMILY_NAME
# if !VLC_WINSTORE_APP
# define HAVE_GET_FONT_BY_FAMILY_NAME
# endif
#endif
/* FontConfig */
...
...
@@ -1949,7 +1951,7 @@ static int Create( vlc_object_t *p_this )
#if !TARGET_OS_IPHONE
p_sys
->
pf_select
=
MacLegacy_Select
;
#endif
#elif defined( _WIN32 )
#elif defined( _WIN32 )
&& defined( HAVE_GET_FONT_BY_FAMILY_NAME )
p_sys
->
pf_select
=
Win32_Select
;
#else
p_sys
->
pf_select
=
Dummy_Select
;
...
...
modules/text_renderer/platform_fonts.c
View file @
dacf900c
...
...
@@ -418,7 +418,7 @@ char* Dummy_Select( filter_t *p_filter, const char* psz_font,
VLC_UNUSED
(
i_idx
);
char
*
psz_fontname
;
# if
def _WIN32
# if
defined( _WIN32 ) && !VLC_WINSTORE_APP
/* Get Windows Font folder */
char
*
psz_win_fonts_path
=
GetWindowsFontPath
();
if
(
asprintf
(
&
psz_fontname
,
"%s
\\
%s"
,
psz_win_fonts_path
,
psz_font
)
==
-
1
)
...
...
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