cache: construct cache values only from corresponding keys

This commit forces construction of cache values using only data
available in its companion keys. That ensures logical correctness:
keys are guaranteed to have all the necessary data, and prevents
accidental collisions.

Most fixes of cache logic correspond to minor problem
when rendering is done with double parameter but cache key stores
its approximate fixed-point representation. The only serious problem
is missing scale of clip drawing. Also this commit removes unused
scale parameters from glyph metrics cache key.

Due to missing scale clip shapes that differed only in scale
treated by cache system as identical. That can lead to incorrect reuse
of cached bitmap of different scale instead of correct one.

The only hack left is in glyph metrics cache with its
unicode >= VERTICAL_LOWER_BOUND check.

1 files changed, 4 insertions, 4 deletions

diff --git a/libass/ass_render.h b/libass/ass_render.h
index f2af0b7..539d619 100644
--- a/libass/ass_render.h
+++ b/libass/ass_render.h
@@ -109,9 +109,6 @@ typedef struct {
     BitmapRef *bitmaps;
 
     int x, y;
-    ASS_Rect rect, rect_o;
-    size_t n_bm, n_bm_o;
-
     Bitmap *bm, *bm_o, *bm_s;   // glyphs, outline, shadow bitmaps
     CompositeHashValue *image;
 } CombinedBitmapInfo;
@@ -156,10 +153,13 @@ typedef struct glyph_info {
     double frx, fry, frz;       // rotation
     double fax, fay;            // text shearing
     double scale_x, scale_y;
-    double orig_scale_x, orig_scale_y; // scale_x,y before fix_glyph_scaling
+    // amount of scale_x,y change due to fix_glyph_scaling
+    // scale_fix = before / after
+    double scale_fix;
     int border_style;
     double border_x, border_y;
     double hspacing;
+    int hspacing_scaled;        // 26.6
     unsigned italic;
     unsigned bold;
     int flags;