1 files changed, 9 insertions, 9 deletions
diff --git a/libass/ass_cache_template.h b/libass/ass_cache_template.h
index 9d81231..ba9303f 100644
--- a/libass/ass_cache_template.h
+++ b/libass/ass_cache_template.h
@@ -6,8 +6,8 @@
         type member;
 #define STRING(member) \
         char *member;
-#define FTVECTOR(member) \
-        FT_Vector member;
+#define VECTOR(member) \
+        ASS_Vector member;
 #define BITMAPHASHKEY(member) \
         BitmapHashKey member;
 #define END(typedefnamename) \
@@ -25,7 +25,7 @@
             a->member == b->member &&
 #define STRING(member) \
             strcmp(a->member, b->member) == 0 &&
-#define FTVECTOR(member) \
+#define VECTOR(member) \
             a->member.x == b->member.x && a->member.y == b->member.y &&
 #define BITMAPHASHKEY(member) \
             bitmap_compare(&a->member, &b->member, sizeof(a->member)) &&
@@ -44,7 +44,7 @@
         hval = fnv_32a_buf(&p->member, sizeof(p->member), hval);
 #define STRING(member) \
         hval = fnv_32a_str(p->member, hval);
-#define FTVECTOR(member) GENERIC(, member.x); GENERIC(, member.y);
+#define VECTOR(member) GENERIC(, member.x); GENERIC(, member.y);
 #define BITMAPHASHKEY(member) { \
         unsigned temp = bitmap_hash(&p->member, sizeof(p->member)); \
         hval = fnv_32a_buf(&temp, sizeof(temp), hval); \
@@ -72,7 +72,7 @@ START(outline_bitmap, outline_bitmap_hash_key)
     // = (glyph base point) - (rotation origin), otherwise
     GENERIC(int, shift_x)
     GENERIC(int, shift_y)
-    FTVECTOR(advance) // subpixel shift vector
+    VECTOR(advance) // subpixel shift vector
 END(OutlineBitmapHashKey)
 
 // describe a clip mask bitmap
@@ -90,7 +90,7 @@ START(glyph, glyph_hash_key)
     GENERIC(int, italic)
     GENERIC(unsigned, scale_x) // 16.16
     GENERIC(unsigned, scale_y) // 16.16
-    FTVECTOR(outline) // border width, 26.6
+    VECTOR(outline) // border width, 26.6
     GENERIC(unsigned, flags)    // glyph decoration flags
     GENERIC(unsigned, border_style)
     GENERIC(int, hspacing) // 16.16
@@ -110,7 +110,7 @@ START(drawing, drawing_hash_key)
     GENERIC(unsigned, scale_x)
     GENERIC(unsigned, scale_y)
     GENERIC(int, pbo)
-    FTVECTOR(outline)
+    VECTOR(outline)
     GENERIC(unsigned, border_style)
     GENERIC(int, hspacing)
     GENERIC(int, scale)
@@ -123,12 +123,12 @@ START(filter, filter_desc)
     GENERIC(int, flags)
     GENERIC(int, be)
     GENERIC(double, blur)
-    FTVECTOR(shadow)
+    VECTOR(shadow)
 END(FilterDesc)
 
 #undef START
 #undef GENERIC
 #undef STRING
-#undef FTVECTOR
+#undef VECTOR
 #undef BITMAPHASHKEY
 #undef END