diff options
| author | Lars Abrahamsson <wonko@opera.com> | 2009-12-31 18:26:14 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2009-12-31 18:26:14 +0100 |
| commit | 8cf9b74cf06aed77c874d94477cfbb0ce08eeea2 (patch) | |
| tree | 6a4afeca2b45d1450dc0422fd618c051a2875c24 /src/base | |
| parent | 173bdc681a333ba448310439b810b100b70f448d (diff) | |
Make compilation with FT_CONFIG_OPTION_PIC work again.
* src/base/ftglyph.c (FT_Glyph_To_Bitmap) [FT_CONFIG_OPTION_PIC]:
Declare `library' for FT_BITMAP_GLYPH_CLASS_GET.
* src/base/ftinit.c (ft_destroy_default_module_classes,
ft_create_default_module_classes): Use proper casts (needed for C++
compilation).
* src/sfnt/ttcmap.c (tt_cmap13_class_rec): Use FT_DEFINE_TT_CMAP.
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/ftglyph.c | 6 | ||||
| -rw-r--r-- | src/base/ftinit.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c index ef61d45d..3505d6dd 100644 --- a/src/base/ftglyph.c +++ b/src/base/ftglyph.c @@ -372,7 +372,7 @@ if ( slot->format == FT_GLYPH_FORMAT_BITMAP ) clazz = FT_BITMAP_GLYPH_CLASS_GET; - /* it it is an outline too */ + /* if it is an outline */ else if ( slot->format == FT_GLYPH_FORMAT_OUTLINE ) clazz = FT_OUTLINE_GLYPH_CLASS_GET; @@ -515,6 +515,10 @@ const FT_Glyph_Class* clazz; +#ifdef FT_CONFIG_OPTION_PIC + FT_Library library = FT_GLYPH( glyph )->library; +#endif + /* check argument */ if ( !the_glyph ) diff --git a/src/base/ftinit.c b/src/base/ftinit.c index ef135038..f94f25a8 100644 --- a/src/base/ftinit.c +++ b/src/base/ftinit.c @@ -115,7 +115,7 @@ FT_Module_Class** classes; FT_Memory memory; FT_UInt i; - BasePIC* pic_container = library->pic_container.base; + BasePIC* pic_container = (BasePIC*)library->pic_container.base; if ( !pic_container->default_module_classes ) return; @@ -145,7 +145,7 @@ FT_Module_Class** classes; FT_Module_Class* clazz; FT_UInt i; - BasePIC* pic_container = library->pic_container.base; + BasePIC* pic_container = (BasePIC*)library->pic_container.base; memory = library->memory; pic_container->default_module_classes = 0; |