[MPlayer-cvslog] r22232 - in trunk/libass: ass_cache.h ass_render.c

[eugeni]

Author: eugeni
Date: Fri Feb 16 18:51:07 2007
New Revision: 22232

Modified:
   trunk/libass/ass_cache.h
   trunk/libass/ass_render.c

Log:
Consistently name z-axis rotation angle "frz".


Modified: trunk/libass/ass_cache.h
==============================================================================
--- trunk/libass/ass_cache.h	(original)
+++ trunk/libass/ass_cache.h	Fri Feb 16 18:51:07 2007
@@ -39,7 +39,7 @@
 
 	// 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;

Modified: trunk/libass/ass_render.c
==============================================================================
--- trunk/libass/ass_render.c	(original)
+++ trunk/libass/ass_render.c	Fri Feb 16 18:51:07 2007
@@ -128,7 +128,7 @@
 	
 	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 @@
 		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 @@
 	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 @@
 	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 @@
 		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);