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
5a9ba0a5
Commit
5a9ba0a5
authored
Aug 22, 2009
by
Erwan Tulou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
freetype: On Win32 (no fontconfig), correct compilation problems
parent
96998812
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
modules/misc/freetype.c
modules/misc/freetype.c
+5
-1
modules/misc/text_renderer.h
modules/misc/text_renderer.h
+3
-0
No files found.
modules/misc/freetype.c
View file @
5a9ba0a5
...
...
@@ -436,8 +436,12 @@ static int Create( vlc_object_t *p_this )
# endif
#else
p_sys
->
psz_fontfamily
=
strdup
(
DEFAULT_FONT
)
#ifdef HAVE_FONTCONFIG
p_sys
->
psz_fontfamily
=
strdup
(
DEFAULT_FONT
);
psz_fontfile
=
psz_fontfamily
;
#endif
#endif
i_error
=
FT_Init_FreeType
(
&
p_sys
->
p_library
);
...
...
modules/misc/text_renderer.h
View file @
5a9ba0a5
...
...
@@ -542,6 +542,7 @@ static int ProcessNodes( filter_t *p_filter,
if
(
p_font_style
->
i_style_flags
&
STYLE_UNDERLINE
)
b_uline
=
true
;
}
#ifdef HAVE_FONTCONFIG
else
{
rv
=
PushFont
(
&
p_fonts
,
...
...
@@ -551,6 +552,8 @@ static int ProcessNodes( filter_t *p_filter,
(((
255
-
p_sys
->
i_font_opacity
)
&
0xff
)
<<
24
),
0x00ffffff
);
}
#endif
if
(
rv
!=
VLC_SUCCESS
)
return
rv
;
...
...
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