Index: src/base/basepic.h |
diff --git a/src/base/basepic.h b/src/base/basepic.h |
index bf90bef0be77462399ab2569ef6991213b6c9bf2..329d7c8fd61ab116d8d33dfed82a8e0e8daf5ebc 100644 |
--- a/src/base/basepic.h |
+++ b/src/base/basepic.h |
@@ -25,11 +25,13 @@ FT_BEGIN_HEADER |
#include FT_INTERNAL_PIC_H |
#ifndef FT_CONFIG_OPTION_PIC |
-#define FT_OUTLINE_GLYPH_CLASS_GET &ft_outline_glyph_class |
-#define FT_BITMAP_GLYPH_CLASS_GET &ft_bitmap_glyph_class |
-#define FT_DEFAULT_MODULES_GET ft_default_modules |
+ |
+#define FT_OUTLINE_GLYPH_CLASS_GET &ft_outline_glyph_class |
+#define FT_BITMAP_GLYPH_CLASS_GET &ft_bitmap_glyph_class |
+#define FT_DEFAULT_MODULES_GET ft_default_modules |
+ |
#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK |
-#define FT_RACCESS_GUESS_TABLE_GET ft_raccess_guess_table |
+#define FT_RACCESS_GUESS_TABLE_GET ft_raccess_guess_table |
#endif |
#else /* FT_CONFIG_OPTION_PIC */ |
@@ -41,25 +43,35 @@ FT_BEGIN_HEADER |
#endif |
- typedef struct BasePIC_ |
+ typedef struct BasePIC_ |
{ |
- FT_Module_Class** default_module_classes; |
- FT_Glyph_Class ft_outline_glyph_class; |
- FT_Glyph_Class ft_bitmap_glyph_class; |
+ FT_Module_Class** default_module_classes; |
+ FT_Glyph_Class ft_outline_glyph_class; |
+ FT_Glyph_Class ft_bitmap_glyph_class; |
+ |
#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK |
- ft_raccess_guess_rec ft_raccess_guess_table[FT_RACCESS_N_RULES]; |
+ ft_raccess_guess_rec ft_raccess_guess_table[FT_RACCESS_N_RULES]; |
#endif |
+ |
} BasePIC; |
-#define GET_PIC(lib) ((BasePIC*)((lib)->pic_container.base)) |
-#define FT_OUTLINE_GLYPH_CLASS_GET (&GET_PIC(library)->ft_outline_glyph_class) |
-#define FT_BITMAP_GLYPH_CLASS_GET (&GET_PIC(library)->ft_bitmap_glyph_class) |
-#define FT_DEFAULT_MODULES_GET (GET_PIC(library)->default_module_classes) |
+ |
+#define GET_PIC( lib ) ( (BasePIC*)( (lib)->pic_container.base ) ) |
+ |
+#define FT_OUTLINE_GLYPH_CLASS_GET \ |
+ ( &GET_PIC( library )->ft_outline_glyph_class ) |
+#define FT_BITMAP_GLYPH_CLASS_GET \ |
+ ( &GET_PIC( library )->ft_bitmap_glyph_class ) |
+#define FT_DEFAULT_MODULES_GET \ |
+ ( GET_PIC( library )->default_module_classes ) |
+ |
#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK |
-#define FT_RACCESS_GUESS_TABLE_GET (GET_PIC(library)->ft_raccess_guess_table) |
+#define FT_RACCESS_GUESS_TABLE_GET \ |
+ ( GET_PIC( library )->ft_raccess_guess_table ) |
#endif |
- /* see basepic.c for the implementation. */ |
+ |
+ /* see basepic.c for the implementation */ |
void |
ft_base_pic_free( FT_Library library ); |
@@ -67,7 +79,8 @@ FT_BEGIN_HEADER |
ft_base_pic_init( FT_Library library ); |
#endif /* FT_CONFIG_OPTION_PIC */ |
- /* */ |
+ |
+ /* */ |
FT_END_HEADER |