summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrigori Goronzy <greg@blackbox>2010-01-06 23:58:05 +0100
committerGrigori Goronzy <greg@blackbox>2010-01-07 09:05:27 +0100
commit9e64911f424dac4e960fbe4c7a4df98433d05b93 (patch)
tree2de88c1c3a697a7e254968d0a828c3bd03bb1b08
parent7df7db97fdda2ea6f8617882cd5202575f44bfc5 (diff)
downloadlibass-9e64911f424dac4e960fbe4c7a4df98433d05b93.tar.bz2
libass-9e64911f424dac4e960fbe4c7a4df98433d05b93.tar.xz
Use conversion functions to generate cache keys
Use the fixed-point conversion functions instead of (slightly incorrect) manual conversion.
-rw-r--r--libass/ass_render.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libass/ass_render.c b/libass/ass_render.c
index 22edce8..6bc0c61 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -1907,13 +1907,13 @@ ass_render_event(ASS_Renderer *render_priv, ASS_Event *event,
drawing->hash;
text_info->glyphs[text_info->length].hash_key.ch = code;
text_info->glyphs[text_info->length].hash_key.outline.x =
- render_priv->state.border_x * 0xFFFF;
+ double_to_d16(render_priv->state.border_x);
text_info->glyphs[text_info->length].hash_key.outline.y =
- render_priv->state.border_y * 0xFFFF;
+ double_to_d16(render_priv->state.border_y);
text_info->glyphs[text_info->length].hash_key.scale_x =
- render_priv->state.scale_x * 0xFFFF;
+ double_to_d16(render_priv->state.scale_x);
text_info->glyphs[text_info->length].hash_key.scale_y =
- render_priv->state.scale_y * 0xFFFF;
+ double_to_d16(render_priv->state.scale_y);
text_info->glyphs[text_info->length].hash_key.frx =
rot_key(render_priv->state.frx);
text_info->glyphs[text_info->length].hash_key.fry =
@@ -1921,9 +1921,9 @@ ass_render_event(ASS_Renderer *render_priv, ASS_Event *event,
text_info->glyphs[text_info->length].hash_key.frz =
rot_key(render_priv->state.frz);
text_info->glyphs[text_info->length].hash_key.fax =
- render_priv->state.fax * 0xFFFF;
+ double_to_d16(render_priv->state.fax);
text_info->glyphs[text_info->length].hash_key.fay =
- render_priv->state.fay * 0xFFFF;
+ double_to_d16(render_priv->state.fay);
text_info->glyphs[text_info->length].hash_key.advance.x = pen.x;
text_info->glyphs[text_info->length].hash_key.advance.y = pen.y;
text_info->glyphs[text_info->length].hash_key.be =