diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-06-19 19:23:53 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-06-20 16:08:00 +0300 |
commit | 6a5c6a3748e3825d7a4281cfeac4ca25b32c8571 (patch) | |
tree | ec444eff224e064351a2fbda866324df7d15fd23 /libass/ass_cache_template.c | |
parent | 49bf5a419a286d70b3a82f4a60059849ed2c536a (diff) | |
download | libass-6a5c6a3748e3825d7a4281cfeac4ca25b32c8571.tar.bz2 libass-6a5c6a3748e3825d7a4281cfeac4ca25b32c8571.tar.xz |
ass_cache_template.c: Undo automatic reindent for this file
The 'indent' program does not understand the macro trickery in this
file and the result was clearly worse than the original.
Diffstat (limited to 'libass/ass_cache_template.c')
-rw-r--r-- | libass/ass_cache_template.c | 52 |
1 files changed, 31 insertions, 21 deletions
diff --git a/libass/ass_cache_template.c b/libass/ass_cache_template.c index b03de538..7f9ec95f 100644 --- a/libass/ass_cache_template.c +++ b/libass/ass_cache_template.c @@ -16,7 +16,7 @@ { \ struct structname *a = key1; \ struct structname *b = key2; \ - return // conditions follow + return // conditions follow #define GENERIC(type, member) \ a->member == b->member && #define FTVECTOR(member) \ @@ -47,31 +47,41 @@ // describes a bitmap; bitmaps with equivalents structs are considered identical START(bitmap, bipmap_hash_key_s) - GENERIC(char, bitmap) // bool : true = bitmap, false = outline + GENERIC(char, bitmap) // bool : true = bitmap, false = outline GENERIC(ass_font_t *, font) - GENERIC(double, size) // font size - GENERIC(uint32_t, ch) // character code - GENERIC(unsigned, outline) // border width, 16.16 fixed point value - GENERIC(int, bold) GENERIC(int, italic) GENERIC(char, be) // blur edges - GENERIC(double, blur) // gaussian blur - GENERIC(unsigned, scale_x) // 16.16 - GENERIC(unsigned, scale_y) // 16.16 - GENERIC(int, frx) // signed 16.16 - GENERIC(int, fry) // signed 16.16 - GENERIC(int, frz) // signed 16.16 + GENERIC(double, size) // font size + GENERIC(uint32_t, ch) // character code + GENERIC(unsigned, outline) // border width, 16.16 fixed point value + GENERIC(int, bold) + GENERIC(int, italic) + GENERIC(char, be) // blur edges + GENERIC(double, blur) // gaussian blur + GENERIC(unsigned, scale_x) // 16.16 + GENERIC(unsigned, scale_y) // 16.16 + GENERIC(int, frx) // signed 16.16 + GENERIC(int, fry) // signed 16.16 + GENERIC(int, frz) // signed 16.16 // shift vector that was added to glyph before applying rotation // = 0, if frx = fry = frx = 0 // = (glyph base point) - (rotation origin), otherwise - GENERIC(int, shift_x) GENERIC(int, shift_y) FTVECTOR(advance) // subpixel shift vector - END(bitmap_hash_key_t) - // describes an outline glyph - START(glyph, glyph_hash_key_s) GENERIC(ass_font_t *, font) GENERIC(double, size) // font size - GENERIC(uint32_t, ch) // character code - GENERIC(int, bold) GENERIC(int, italic) GENERIC(unsigned, scale_x) // 16.16 - GENERIC(unsigned, scale_y) // 16.16 - FTVECTOR(advance) // subpixel shift vector - GENERIC(unsigned, outline) // border width, 16.16 + GENERIC(int, shift_x) + GENERIC(int, shift_y) + FTVECTOR(advance) // subpixel shift vector +END(bitmap_hash_key_t) + +// describes an outline glyph +START(glyph, glyph_hash_key_s) + GENERIC(ass_font_t *, font) + GENERIC(double, size) // font size + GENERIC(uint32_t, ch) // character code + GENERIC(int, bold) + GENERIC(int, italic) + GENERIC(unsigned, scale_x) // 16.16 + GENERIC(unsigned, scale_y) // 16.16 + FTVECTOR(advance) // subpixel shift vector + GENERIC(unsigned, outline) // border width, 16.16 END(glyph_hash_key_t) + #undef START #undef GENERIC #undef FTVECTOR |