diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 10:33:22 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 10:33:22 +0100 |
| commit | 41bd254198b8b879a562a85f7dc868c3c0f7fbc1 (patch) | |
| tree | 3db49b4d73b8c4c734c1382ab5469a4f9f8baf93 /freetype/src/sfnt/sfdriver.c | |
| parent | b91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff) | |
| download | vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.tar.gz vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.tar.bz2 vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.zip | |
Updated to freetype-2.4.9
Diffstat (limited to 'freetype/src/sfnt/sfdriver.c')
| -rw-r--r-- | freetype/src/sfnt/sfdriver.c | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/freetype/src/sfnt/sfdriver.c b/freetype/src/sfnt/sfdriver.c index 247aa6799..847d83d2e 100644 --- a/freetype/src/sfnt/sfdriver.c +++ b/freetype/src/sfnt/sfdriver.c @@ -422,8 +422,19 @@ sfnt_get_interface( FT_Module module, const char* module_interface ) { - FT_UNUSED( module ); + /* FT_SFNT_SERVICES_GET derefers `library' in PIC mode */ +#ifdef FT_CONFIG_OPTION_PIC + FT_Library library; + + if ( !module ) + return NULL; + library = module->library; + if ( !library ) + return NULL; +#else + FT_UNUSED( module ); +#endif return ft_service_list_lookup( FT_SFNT_SERVICES_GET, module_interface ); } @@ -556,14 +567,14 @@ #endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS -#define PUT_EMBEDDED_BITMAPS(a) a +#define PUT_EMBEDDED_BITMAPS(a) a #else -#define PUT_EMBEDDED_BITMAPS(a) 0 +#define PUT_EMBEDDED_BITMAPS(a) 0 #endif #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES -#define PUT_PS_NAMES(a) a +#define PUT_PS_NAMES(a) a #else -#define PUT_PS_NAMES(a) 0 +#define PUT_PS_NAMES(a) 0 #endif FT_DEFINE_SFNT_INTERFACE(sfnt_interface, @@ -637,9 +648,9 @@ FT_DEFINE_MODULE(sfnt_module_class, - + 0, /* not a font driver or renderer */ - sizeof( FT_ModuleRec ), + sizeof ( FT_ModuleRec ), "sfnt", /* driver name */ 0x10000L, /* driver version 1.0 */ |