summaryrefslogtreecommitdiffstats
path: root/libass/ass_font.h
diff options
context:
space:
mode:
authorgreg <greg@blackbox>2009-06-18 17:54:08 +0200
committergreg <greg@blackbox>2009-06-20 03:38:00 +0200
commit2303b5430337da60f582613f95e605f08606759f (patch)
tree7ab52c9de634da3dfe55e1f36e87030beff2a3fe /libass/ass_font.h
parent9c7521c0224f16880870839f7492e50b1c8602f7 (diff)
downloadlibass-2303b5430337da60f582613f95e605f08606759f.tar.bz2
libass-2303b5430337da60f582613f95e605f08606759f.tar.xz
Reindent all source code.
Reindent complete source code (*.c, *.h) with indent, the exact command line being: indent -kr -i4 -bap -nut -l76 *.c *.h From now on, new code should use (more or less) K&R style, only spaces and no tabs, 4 spaces indent width. Avoid long lines. Fix function declaration pointer spacing. Remove spaces that were added to many function declarations by indent, like some_func(foo_t * bar). Fix indenting of macros in ass.c
Diffstat (limited to 'libass/ass_font.h')
-rw-r--r--libass/ass_font.h47
1 files changed, 25 insertions, 22 deletions
diff --git a/libass/ass_font.h b/libass/ass_font.h
index 6a6793d..b208064 100644
--- a/libass/ass_font.h
+++ b/libass/ass_font.h
@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 8; indent-tabs-mode: t -*-
-// vim:ts=8:sw=8:noet:ai:
/*
* Copyright (C) 2006 Evgeniy Stepanov <eugeni.stepanov@gmail.com>
*
@@ -30,32 +28,37 @@
#include "ass_types.h"
typedef struct ass_font_desc_s {
- char* family;
- unsigned bold;
- unsigned italic;
- int treat_family_as_pattern;
+ char *family;
+ unsigned bold;
+ unsigned italic;
+ int treat_family_as_pattern;
} ass_font_desc_t;
#define ASS_FONT_MAX_FACES 10
typedef struct ass_font_s {
- ass_font_desc_t desc;
- ass_library_t* library;
- FT_Library ftlibrary;
- FT_Face faces[ASS_FONT_MAX_FACES];
- int n_faces;
- double scale_x, scale_y; // current transform
- FT_Vector v; // current shift
- double size;
+ ass_font_desc_t desc;
+ ass_library_t *library;
+ FT_Library ftlibrary;
+ FT_Face faces[ASS_FONT_MAX_FACES];
+ int n_faces;
+ double scale_x, scale_y; // current transform
+ FT_Vector v; // current shift
+ double size;
} ass_font_t;
// FIXME: passing the hashmap via a void pointer is very ugly.
-ass_font_t* ass_font_new(void* font_cache, ass_library_t* library, FT_Library ftlibrary, void* fc_priv, ass_font_desc_t* desc);
-void ass_font_set_transform(ass_font_t* font, double scale_x, double scale_y, FT_Vector* v);
-void ass_font_set_size(ass_font_t* font, double size);
-void ass_font_get_asc_desc(ass_font_t* font, uint32_t ch, int* asc, int* desc);
-FT_Glyph ass_font_get_glyph(void* fontconfig_priv, ass_font_t* font, uint32_t ch, ass_hinting_t hinting);
-FT_Vector ass_font_get_kerning(ass_font_t* font, uint32_t c1, uint32_t c2);
-void ass_font_free(ass_font_t* font);
+ass_font_t *ass_font_new(void *font_cache, ass_library_t *library,
+ FT_Library ftlibrary, void *fc_priv,
+ ass_font_desc_t *desc);
+void ass_font_set_transform(ass_font_t *font, double scale_x,
+ double scale_y, FT_Vector * v);
+void ass_font_set_size(ass_font_t *font, double size);
+void ass_font_get_asc_desc(ass_font_t *font, uint32_t ch, int *asc,
+ int *desc);
+FT_Glyph ass_font_get_glyph(void *fontconfig_priv, ass_font_t *font,
+ uint32_t ch, ass_hinting_t hinting);
+FT_Vector ass_font_get_kerning(ass_font_t *font, uint32_t c1, uint32_t c2);
+void ass_font_free(ass_font_t *font);
-#endif /* LIBASS_FONT_H */
+#endif /* LIBASS_FONT_H */