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
c3d40f74
Commit
c3d40f74
authored
Jul 26, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove xml parser remainings in freetype
parent
551d9d30
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
17 deletions
+0
-17
modules/text_renderer/freetype.c
modules/text_renderer/freetype.c
+0
-15
modules/text_renderer/freetype.h
modules/text_renderer/freetype.h
+0
-2
No files found.
modules/text_renderer/freetype.c
View file @
c3d40f74
...
@@ -39,7 +39,6 @@
...
@@ -39,7 +39,6 @@
#include <vlc_plugin.h>
#include <vlc_plugin.h>
#include <vlc_stream.h>
/* stream_MemoryNew */
#include <vlc_stream.h>
/* stream_MemoryNew */
#include <vlc_input.h>
/* vlc_input_attachment_* */
#include <vlc_input.h>
/* vlc_input_attachment_* */
#include <vlc_xml.h>
/* xml_reader */
#include <vlc_dialog.h>
/* FcCache dialog */
#include <vlc_dialog.h>
/* FcCache dialog */
#include <vlc_filter.h>
/* filter_sys_t */
#include <vlc_filter.h>
/* filter_sys_t */
#include <vlc_text_style.h>
/* text_style_t*/
#include <vlc_text_style.h>
/* text_style_t*/
...
@@ -896,18 +895,6 @@ static FT_Face LoadEmbeddedFace( filter_sys_t *p_sys, const text_style_t *p_styl
...
@@ -896,18 +895,6 @@ static FT_Face LoadEmbeddedFace( filter_sys_t *p_sys, const text_style_t *p_styl
return
NULL
;
return
NULL
;
}
}
static
xml_reader_t
*
GetXMLReader
(
filter_t
*
p_filter
,
stream_t
*
p_sub
)
{
xml_reader_t
*
p_xml_reader
=
p_filter
->
p_sys
->
p_xml
;
if
(
!
p_xml_reader
)
p_xml_reader
=
xml_ReaderCreate
(
p_filter
,
p_sub
);
else
p_xml_reader
=
xml_ReaderReset
(
p_xml_reader
,
p_sub
);
p_filter
->
p_sys
->
p_xml
=
p_xml_reader
;
return
p_xml_reader
;
}
static
text_style_t
*
ApplyDefaultStyle
(
filter_t
*
p_filter
,
text_style_t
*
p_original_style
)
static
text_style_t
*
ApplyDefaultStyle
(
filter_t
*
p_filter
,
text_style_t
*
p_original_style
)
{
{
filter_sys_t
*
p_sys
=
p_filter
->
p_sys
;
filter_sys_t
*
p_sys
=
p_filter
->
p_sys
;
...
@@ -1188,7 +1175,6 @@ static int Create( vlc_object_t *p_this )
...
@@ -1188,7 +1175,6 @@ static int Create( vlc_object_t *p_this )
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
p_sys
->
style
.
psz_fontname
=
NULL
;
p_sys
->
style
.
psz_fontname
=
NULL
;
p_sys
->
p_xml
=
NULL
;
p_sys
->
p_face
=
0
;
p_sys
->
p_face
=
0
;
p_sys
->
p_library
=
0
;
p_sys
->
p_library
=
0
;
p_sys
->
style
.
i_font_size
=
0
;
p_sys
->
style
.
i_font_size
=
0
;
...
@@ -1350,7 +1336,6 @@ static void Destroy( vlc_object_t *p_this )
...
@@ -1350,7 +1336,6 @@ static void Destroy( vlc_object_t *p_this )
free
(
p_sys
->
pp_font_attachments
);
free
(
p_sys
->
pp_font_attachments
);
}
}
if
(
p_sys
->
p_xml
)
xml_ReaderDelete
(
p_sys
->
p_xml
);
free
(
p_sys
->
style
.
psz_fontname
);
free
(
p_sys
->
style
.
psz_fontname
);
free
(
p_sys
->
style
.
psz_monofontname
);
free
(
p_sys
->
style
.
psz_monofontname
);
...
...
modules/text_renderer/freetype.h
View file @
c3d40f74
...
@@ -45,8 +45,6 @@ struct filter_sys_t
...
@@ -45,8 +45,6 @@ struct filter_sys_t
FT_Face
p_face
;
/* handle to face object */
FT_Face
p_face
;
/* handle to face object */
FT_Stroker
p_stroker
;
/* handle to path stroker object */
FT_Stroker
p_stroker
;
/* handle to path stroker object */
xml_reader_t
*
p_xml
;
/* vlc xml parser */
text_style_t
style
;
/* Current Style */
text_style_t
style
;
/* Current Style */
/* More styles... */
/* More styles... */
...
...
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