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
f3f09df3
Commit
f3f09df3
authored
Dec 15, 2013
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Freetype: rename HAVE_STYLES
parent
9e3a4af5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
modules/text_renderer/freetype.c
modules/text_renderer/freetype.c
+5
-5
No files found.
modules/text_renderer/freetype.c
View file @
f3f09df3
...
@@ -65,18 +65,18 @@
...
@@ -65,18 +65,18 @@
#ifdef __APPLE__
#ifdef __APPLE__
# include <TargetConditionals.h>
# include <TargetConditionals.h>
# undef HAVE_FONTCONFIG
# undef HAVE_FONTCONFIG
# define HAVE_
STYLES
# define HAVE_
GET_FONT_BY_FAMILY_NAME
#endif
#endif
/* Win32 */
/* Win32 */
#ifdef _WIN32
#ifdef _WIN32
# undef HAVE_FONTCONFIG
# undef HAVE_FONTCONFIG
# define HAVE_
STYLES
# define HAVE_
GET_FONT_BY_FAMILY_NAME
#endif
#endif
/* FontConfig */
/* FontConfig */
#ifdef HAVE_FONTCONFIG
#ifdef HAVE_FONTCONFIG
# define HAVE_
STYLES
# define HAVE_
GET_FONT_BY_FAMILY_NAME
#endif
#endif
#include <assert.h>
#include <assert.h>
...
@@ -159,7 +159,7 @@ vlc_module_begin ()
...
@@ -159,7 +159,7 @@ vlc_module_begin ()
set_category
(
CAT_VIDEO
)
set_category
(
CAT_VIDEO
)
set_subcategory
(
SUBCAT_VIDEO_SUBPIC
)
set_subcategory
(
SUBCAT_VIDEO_SUBPIC
)
#ifdef HAVE_
STYLES
#ifdef HAVE_
GET_FONT_BY_FAMILY_NAME
add_font
(
"freetype-font"
,
DEFAULT_FAMILY
,
FONT_TEXT
,
FAMILY_LONGTEXT
,
false
)
add_font
(
"freetype-font"
,
DEFAULT_FAMILY
,
FONT_TEXT
,
FAMILY_LONGTEXT
,
false
)
add_font
(
"freetype-monofont"
,
DEFAULT_MONOSPACE_FAMILY
,
MONOSPACE_FONT_TEXT
,
FAMILY_LONGTEXT
,
false
)
add_font
(
"freetype-monofont"
,
DEFAULT_MONOSPACE_FAMILY
,
MONOSPACE_FONT_TEXT
,
FAMILY_LONGTEXT
,
false
)
#else
#else
...
@@ -1919,7 +1919,7 @@ static int Create( vlc_object_t *p_this )
...
@@ -1919,7 +1919,7 @@ static int Create( vlc_object_t *p_this )
if
(
!
psz_fontname
||
!*
psz_fontname
)
if
(
!
psz_fontname
||
!*
psz_fontname
)
{
{
free
(
psz_fontname
);
free
(
psz_fontname
);
#ifdef HAVE_
STYLES
#ifdef HAVE_
GET_FONT_BY_FAMILY_NAME
psz_fontname
=
strdup
(
DEFAULT_FAMILY
);
psz_fontname
=
strdup
(
DEFAULT_FAMILY
);
#else
#else
psz_fontname
=
File_Select
(
DEFAULT_FONT_FILE
);
psz_fontname
=
File_Select
(
DEFAULT_FONT_FILE
);
...
...
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