summaryrefslogtreecommitdiffstats
path: root/libass
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-16 17:51:07 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-16 17:51:07 +0000
commita2195cd28f225911941761b9e39fbf5dbe0237ff (patch)
tree29c46271c9c37d6b4c1b171ca4279369939424c1 /libass
parent42871d8220fd0b30d710afa41c2c88660a52a78e (diff)
downloadmpv-a2195cd28f225911941761b9e39fbf5dbe0237ff.tar.bz2
mpv-a2195cd28f225911941761b9e39fbf5dbe0237ff.tar.xz
Consistently name z-axis rotation angle "frz".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22232 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
-rw-r--r--libass/ass_cache.h2
-rw-r--r--libass/ass_render.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/libass/ass_cache.h b/libass/ass_cache.h
index bfc3557142..53b86420bf 100644
--- a/libass/ass_cache.h
+++ b/libass/ass_cache.h
@@ -39,7 +39,7 @@ typedef struct glyph_hash_key_s {
// the following affects bitmap glyphs only
unsigned scale_x, scale_y; // 16.16
- int angle; // signed 16.16
+ int frz; // signed 16.16
FT_Vector advance; // subpixel shift vector
} glyph_hash_key_t;
diff --git a/libass/ass_render.c b/libass/ass_render.c
index 897688c11f..90fef20b10 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -128,7 +128,7 @@ typedef struct render_context_s {
FT_Stroker stroker;
int alignment; // alignment overrides go here; if zero, style value will be used
- double rotation;
+ double frz;
enum { EVENT_NORMAL, // "normal" top-, sub- or mid- title
EVENT_POSITIONED, // happens after pos(,), margins are ignored
EVENT_HSCROLL, // "Banner" transition effect, text_width is unlimited
@@ -776,7 +776,7 @@ static char* parse_tag(char* p, double pwr) {
double val;
mystrtod(&p, &val);
val *= M_PI / 180;
- render_context.rotation = val * pwr + render_context.rotation * (1-pwr);
+ render_context.frz = val * pwr + render_context.frz * (1-pwr);
} else if (mystrcmp(&p, "fn")) {
char* start = p;
char* family;
@@ -1151,7 +1151,7 @@ static void reset_render_context(void)
render_context.hspacing = 0; // FIXME
render_context.be = 0;
render_context.shadow = render_context.style->Shadow;
- render_context.rotation = M_PI * render_context.style->Angle / 180.;
+ render_context.frz = M_PI * render_context.style->Angle / 180.;
// FIXME: does not reset unsupported attributes.
}
@@ -1210,7 +1210,7 @@ static int get_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
key->outline = (render_context.border * 0xFFFF); // convert to 16.16
key->scale_x = (render_context.scale_x * 0xFFFF);
key->scale_y = (render_context.scale_y * 0xFFFF);
- key->angle = (render_context.rotation * 0xFFFF);
+ key->frz = (render_context.frz * 0xFFFF);
key->advance = *advance;
key->bold = render_context.bold;
key->italic = render_context.italic;
@@ -1632,7 +1632,7 @@ static int ass_render_event(ass_event_t* event, event_images_t* event_images)
text_info.glyphs[text_info.length].effect_skip_timing = render_context.effect_skip_timing;
text_info.glyphs[text_info.length].be = render_context.be;
text_info.glyphs[text_info.length].shadow = render_context.shadow;
- text_info.glyphs[text_info.length].frz = render_context.rotation;
+ text_info.glyphs[text_info.length].frz = render_context.frz;
ass_font_get_asc_desc(render_context.font, code,
&text_info.glyphs[text_info.length].asc,
&text_info.glyphs[text_info.length].desc);