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
a02c06ff
Commit
a02c06ff
authored
Mar 27, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Freetype: fix regression
Caused by [
231a9671
] Sorry for the disturbance
parent
32334346
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
modules/misc/text_renderer/freetype.c
modules/misc/text_renderer/freetype.c
+4
-4
No files found.
modules/misc/text_renderer/freetype.c
View file @
a02c06ff
...
@@ -347,6 +347,7 @@ static int Create( vlc_object_t *p_this )
...
@@ -347,6 +347,7 @@ static int Create( vlc_object_t *p_this )
msg_Err
(
p_filter
,
"User didn't specify fontfile, using %s"
,
psz_fontfamily
);
msg_Err
(
p_filter
,
"User didn't specify fontfile, using %s"
,
psz_fontfamily
);
#endif
#endif
}
}
p_sys
->
psz_fontfamily
=
psz_fontfamily
;
/* Set the font file */
/* Set the font file */
#ifdef HAVE_FONTCONFIG
#ifdef HAVE_FONTCONFIG
...
@@ -356,11 +357,11 @@ static int Create( vlc_object_t *p_this )
...
@@ -356,11 +357,11 @@ static int Create( vlc_object_t *p_this )
psz_fontfile
=
FontConfig_Select
(
NULL
,
psz_fontfamily
,
false
,
false
,
psz_fontfile
=
FontConfig_Select
(
NULL
,
psz_fontfamily
,
false
,
false
,
p_sys
->
i_default_font_size
,
&
fontindex
);
p_sys
->
i_default_font_size
,
&
fontindex
);
p_sys
->
psz_fontfamily
=
psz_fontfamily
;
msg_Dbg
(
p_filter
,
"Using %s as font from file %s"
,
psz_fontfamily
,
psz_fontfile
);
msg_Dbg
(
p_filter
,
"Using %s as font from file %s"
,
psz_fontfamily
,
psz_fontfile
);
if
(
!
psz_fontfile
)
if
(
!
psz_fontfile
)
#else
psz_fontfile
=
psz_fontfamily
;
psz_fontfile
=
psz_fontfamily
;
#else
psz_fontfile
=
psz_fontfamily
;
#endif
#endif
/* */
/* */
...
@@ -409,7 +410,6 @@ static int Create( vlc_object_t *p_this )
...
@@ -409,7 +410,6 @@ static int Create( vlc_object_t *p_this )
p_filter
->
pf_render_html
=
NULL
;
p_filter
->
pf_render_html
=
NULL
;
#endif
#endif
free
(
psz_fontfamily
);
LoadFontsFromAttachments
(
p_filter
);
LoadFontsFromAttachments
(
p_filter
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
...
@@ -444,8 +444,8 @@ static void Destroy( vlc_object_t *p_this )
...
@@ -444,8 +444,8 @@ static void Destroy( vlc_object_t *p_this )
#ifdef HAVE_STYLES
#ifdef HAVE_STYLES
if
(
p_sys
->
p_xml
)
xml_ReaderDelete
(
p_sys
->
p_xml
);
if
(
p_sys
->
p_xml
)
xml_ReaderDelete
(
p_sys
->
p_xml
);
free
(
p_sys
->
psz_fontfamily
);
#endif
#endif
free
(
p_sys
->
psz_fontfamily
);
/* FcFini asserts calling the subfunction FcCacheFini()
/* FcFini asserts calling the subfunction FcCacheFini()
* even if no other library functions have been made since FcInit(),
* even if no other library functions have been made since FcInit(),
...
...
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