summaryrefslogtreecommitdiffstats
path: root/libass/ass_cache_template.h
diff options
context:
space:
mode:
authorGrigori Goronzy <greg@blackbox>2009-08-06 13:04:20 +0200
committerGrigori Goronzy <greg@blackbox>2009-08-06 13:15:17 +0200
commit892423a588aea8fb14e84bdb9527df97e945ec57 (patch)
treeca98694d710a7b276b79e278fe06579736a5cdc9 /libass/ass_cache_template.h
parent5ddad362f52080c4f2a46e78fc4cca4f8ca6a2b0 (diff)
downloadlibass-892423a588aea8fb14e84bdb9527df97e945ec57.tar.bz2
libass-892423a588aea8fb14e84bdb9527df97e945ec57.tar.xz
Rename typedefs (breaks API)
Rename all typedefs from the convention foo_bar_t, which can possibly conflict with POSIX types, to FooBar (and ASS_FooBar for public API typedefs). Fix formatting and stray comments while at it.
Diffstat (limited to 'libass/ass_cache_template.h')
-rw-r--r--libass/ass_cache_template.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/libass/ass_cache_template.h b/libass/ass_cache_template.h
index 08bce24f..6a6c3f2c 100644
--- a/libass/ass_cache_template.h
+++ b/libass/ass_cache_template.h
@@ -7,7 +7,7 @@
#define FTVECTOR(member) \
FT_Vector member;
#define BITMAPHASHKEY(member) \
- bitmap_hash_key_t member;
+ BitmapHashKey member;
#define END(typedefnamename) \
} typedefnamename;
@@ -56,7 +56,7 @@
// describes a bitmap; bitmaps with equivalents structs are considered identical
START(bitmap, bipmap_hash_key)
GENERIC(char, bitmap) // bool : true = bitmap, false = outline
- GENERIC(ass_font_t *, font)
+ GENERIC(ASS_Font *, font)
GENERIC(double, size) // font size
GENERIC(uint32_t, ch) // character code
FTVECTOR(outline) // border width, 16.16 fixed point value
@@ -79,11 +79,11 @@ START(bitmap, bipmap_hash_key)
FTVECTOR(advance) // subpixel shift vector
FTVECTOR(shadow_offset) // shadow subpixel shift
GENERIC(unsigned, drawing_hash) // hashcode of a drawing
-END(bitmap_hash_key_t)
+END(BitmapHashKey)
// describes an outline glyph
START(glyph, glyph_hash_key)
- GENERIC(ass_font_t *, font)
+ GENERIC(ASS_Font *, font)
GENERIC(double, size) // font size
GENERIC(uint32_t, ch) // character code
GENERIC(int, bold)
@@ -93,7 +93,7 @@ START(glyph, glyph_hash_key)
FTVECTOR(outline) // border width, 16.16
GENERIC(unsigned, drawing_hash) // hashcode of a drawing
GENERIC(unsigned, flags) // glyph decoration flags
-END(glyph_hash_key_t)
+END(GlyphHashKey)
// Cache for composited bitmaps
START(composite, composite_hash_key)
@@ -107,7 +107,7 @@ START(composite, composite_hash_key)
GENERIC(int, by)
BITMAPHASHKEY(a)
BITMAPHASHKEY(b)
-END(composite_hash_key_t)
+END(CompositeHashKey)
#undef START