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
f76916ea
Commit
f76916ea
authored
Aug 26, 2007
by
Bernie Purcell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Whitespace removal
parent
b2019c92
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
modules/misc/freetype.c
modules/misc/freetype.c
+11
-11
No files found.
modules/misc/freetype.c
View file @
f76916ea
...
@@ -517,7 +517,7 @@ static int LoadFontsFromAttachments( filter_t *p_filter )
...
@@ -517,7 +517,7 @@ static int LoadFontsFromAttachments( filter_t *p_filter )
p_input
=
(
input_thread_t
*
)
vlc_object_find
(
p_filter
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
p_input
=
(
input_thread_t
*
)
vlc_object_find
(
p_filter
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
if
(
!
p_input
)
if
(
!
p_input
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
if
(
VLC_SUCCESS
!=
input_Control
(
p_input
,
INPUT_GET_ATTACHMENTS
,
&
pp_attachments
,
&
i_attachments_cnt
))
if
(
VLC_SUCCESS
!=
input_Control
(
p_input
,
INPUT_GET_ATTACHMENTS
,
&
pp_attachments
,
&
i_attachments_cnt
))
{
{
vlc_object_release
(
p_input
);
vlc_object_release
(
p_input
);
...
@@ -552,7 +552,7 @@ static int LoadFontsFromAttachments( filter_t *p_filter )
...
@@ -552,7 +552,7 @@ static int LoadFontsFromAttachments( filter_t *p_filter )
vlc_input_attachment_Delete
(
p_attach
);
vlc_input_attachment_Delete
(
p_attach
);
}
}
}
}
free
(
pp_attachments
);
free
(
pp_attachments
);
vlc_object_release
(
p_input
);
vlc_object_release
(
p_input
);
...
@@ -1057,7 +1057,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
...
@@ -1057,7 +1057,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
if
(
VLC_SUCCESS
==
var_Get
(
p_filter
,
"scale"
,
&
val
))
if
(
VLC_SUCCESS
==
var_Get
(
p_filter
,
"scale"
,
&
val
))
i_scale
=
val
.
i_int
;
i_scale
=
val
.
i_int
;
if
(
p_region_in
->
p_style
)
if
(
p_region_in
->
p_style
)
{
{
i_font_color
=
__MAX
(
__MIN
(
p_region_in
->
p_style
->
i_font_color
,
0xFFFFFF
),
0
);
i_font_color
=
__MAX
(
__MIN
(
p_region_in
->
p_style
->
i_font_color
,
0xFFFFFF
),
0
);
...
@@ -1517,7 +1517,7 @@ static void IconvText( filter_t *p_filter, const char *psz_string,
...
@@ -1517,7 +1517,7 @@ static void IconvText( filter_t *p_filter, const char *psz_string,
}
}
static
ft_style_t
*
GetStyleFromFontStack
(
filter_sys_t
*
p_sys
,
static
ft_style_t
*
GetStyleFromFontStack
(
filter_sys_t
*
p_sys
,
font_stack_t
**
p_fonts
,
vlc_bool_t
b_bold
,
vlc_bool_t
b_italic
,
font_stack_t
**
p_fonts
,
vlc_bool_t
b_bold
,
vlc_bool_t
b_italic
,
vlc_bool_t
b_uline
)
vlc_bool_t
b_uline
)
{
{
ft_style_t
*
p_style
=
NULL
;
ft_style_t
*
p_style
=
NULL
;
...
@@ -1919,7 +1919,7 @@ static void SetupKaraoke( xml_reader_t *p_xml_reader, uint32_t *pi_k_runs,
...
@@ -1919,7 +1919,7 @@ static void SetupKaraoke( xml_reader_t *p_xml_reader, uint32_t *pi_k_runs,
}
}
if
(
*
ppi_k_durations
)
if
(
*
ppi_k_durations
)
(
*
ppi_k_durations
)[
*
pi_k_runs
-
1
]
=
atoi
(
psz_value
);
(
*
ppi_k_durations
)[
*
pi_k_runs
-
1
]
=
atoi
(
psz_value
);
if
(
*
ppi_k_run_lengths
)
if
(
*
ppi_k_run_lengths
)
(
*
ppi_k_run_lengths
)[
*
pi_k_runs
-
1
]
=
0
;
(
*
ppi_k_run_lengths
)[
*
pi_k_runs
-
1
]
=
0
;
}
}
...
@@ -1959,7 +1959,7 @@ static int ProcessNodes( filter_t *p_filter,
...
@@ -1959,7 +1959,7 @@ static int ProcessNodes( filter_t *p_filter,
if
(
VLC_SUCCESS
==
var_Get
(
p_filter
,
"scale"
,
&
val
))
if
(
VLC_SUCCESS
==
var_Get
(
p_filter
,
"scale"
,
&
val
))
i_scale
=
val
.
i_int
;
i_scale
=
val
.
i_int
;
if
(
p_font_style
)
if
(
p_font_style
)
{
{
rv
=
PushFont
(
&
p_fonts
,
rv
=
PushFont
(
&
p_fonts
,
...
@@ -2135,7 +2135,7 @@ static int CheckForEmbeddedFont( filter_sys_t *p_sys, FT_Face *pp_face, ft_style
...
@@ -2135,7 +2135,7 @@ static int CheckForEmbeddedFont( filter_sys_t *p_sys, FT_Face *pp_face, ft_style
*
pp_face
=
p_face
;
*
pp_face
=
p_face
;
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
FT_Done_Face
(
p_face
);
FT_Done_Face
(
p_face
);
}
}
i_font_idx
++
;
i_font_idx
++
;
...
@@ -2152,13 +2152,13 @@ static int ProcessLines( filter_t *p_filter,
...
@@ -2152,13 +2152,13 @@ static int ProcessLines( filter_t *p_filter,
uint32_t
*
pi_run_lengths
,
uint32_t
*
pi_run_lengths
,
ft_style_t
**
pp_styles
,
ft_style_t
**
pp_styles
,
line_desc_t
**
pp_lines
,
line_desc_t
**
pp_lines
,
FT_Vector
*
p_result
,
FT_Vector
*
p_result
,
vlc_bool_t
b_karaoke
,
vlc_bool_t
b_karaoke
,
uint32_t
i_k_runs
,
uint32_t
i_k_runs
,
uint32_t
*
pi_k_run_lengths
,
uint32_t
*
pi_k_run_lengths
,
uint32_t
*
pi_k_durations
)
uint32_t
*
pi_k_durations
)
{
{
filter_sys_t
*
p_sys
=
p_filter
->
p_sys
;
filter_sys_t
*
p_sys
=
p_filter
->
p_sys
;
ft_style_t
**
pp_char_styles
;
ft_style_t
**
pp_char_styles
;
...
@@ -2276,7 +2276,7 @@ static int ProcessLines( filter_t *p_filter,
...
@@ -2276,7 +2276,7 @@ static int ProcessLines( filter_t *p_filter,
int64_t
i_duration
=
0
;
int64_t
i_duration
=
0
;
int64_t
i_start_pos
=
0
;
int64_t
i_start_pos
=
0
;
int64_t
i_elapsed
=
var_GetTime
(
p_filter
,
"spu-elapsed"
)
/
1000
;
int64_t
i_elapsed
=
var_GetTime
(
p_filter
,
"spu-elapsed"
)
/
1000
;
for
(
k
=
0
;
k
<
i_k_runs
;
k
++
)
for
(
k
=
0
;
k
<
i_k_runs
;
k
++
)
{
{
double
fraction
=
0
.
0
;
double
fraction
=
0
.
0
;
...
@@ -2324,7 +2324,7 @@ static int ProcessLines( filter_t *p_filter,
...
@@ -2324,7 +2324,7 @@ static int ProcessLines( filter_t *p_filter,
((
p_levels
?
(
p_levels
[
j
]
%
2
)
:
0
)
<<
7
);
((
p_levels
?
(
p_levels
[
j
]
%
2
)
:
0
)
<<
7
);
}
}
}
}
i_last_duration
=
i_duration
;
i_last_duration
=
i_duration
;
i_start_pos
+=
pi_k_run_lengths
[
k
];
i_start_pos
+=
pi_k_run_lengths
[
k
];
}
}
...
...
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