Merge svn changes up to r28862

1 files changed, 21 insertions, 0 deletions

diff --git a/libass/ass_cache.h b/libass/ass_cache.h
index a76d935992..bad0ed8e6e 100644
--- a/libass/ass_cache.h
+++ b/libass/ass_cache.h
@@ -49,6 +49,27 @@ bitmap_hash_val_t* cache_find_bitmap(bitmap_hash_key_t* key);
 void ass_bitmap_cache_reset(void);
 void ass_bitmap_cache_done(void);
 
+
+// Cache for composited bitmaps
+typedef struct composite_hash_key_s {
+	int aw, ah, bw, bh;
+	int ax, ay, bx, by;
+	bitmap_hash_key_t a;
+	bitmap_hash_key_t b;
+} composite_hash_key_t;
+
+typedef struct composite_hash_val_s {
+	unsigned char* a;
+	unsigned char* b;
+} composite_hash_val_t;
+
+void ass_composite_cache_init(void);
+void* cache_add_composite(composite_hash_key_t* key, composite_hash_val_t* val);
+composite_hash_val_t* cache_find_composite(composite_hash_key_t* key);
+void ass_composite_cache_reset(void);
+void ass_composite_cache_done(void);
+
+
 typedef struct glyph_hash_val_s {
 	FT_Glyph glyph;
 	FT_Glyph outline_glyph;