aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/psnames/psmodule.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-03-12 10:33:22 +0100
committermarha <marha@users.sourceforge.net>2012-03-12 10:33:22 +0100
commit41bd254198b8b879a562a85f7dc868c3c0f7fbc1 (patch)
tree3db49b4d73b8c4c734c1382ab5469a4f9f8baf93 /freetype/src/psnames/psmodule.c
parentb91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff)
downloadvcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.tar.gz
vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.tar.bz2
vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.zip
Updated to freetype-2.4.9
Diffstat (limited to 'freetype/src/psnames/psmodule.c')
-rw-r--r--freetype/src/psnames/psmodule.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/freetype/src/psnames/psmodule.c b/freetype/src/psnames/psmodule.c
index 752869693..361917415 100644
--- a/freetype/src/psnames/psmodule.c
+++ b/freetype/src/psnames/psmodule.c
@@ -521,7 +521,7 @@
#ifdef FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
- FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface,
+ FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface,
(PS_Unicode_ValueFunc) ps_unicode_value,
(PS_Unicodes_InitFunc) ps_unicodes_init,
(PS_Unicodes_CharIndexFunc)ps_unicodes_char_index,
@@ -536,7 +536,7 @@
#else
- FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface,
+ FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface,
0,
0,
0,
@@ -552,7 +552,7 @@
#endif /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST */
- FT_DEFINE_SERVICEDESCREC1(pscmaps_services,
+ FT_DEFINE_SERVICEDESCREC1(pscmaps_services,
FT_SERVICE_ID_POSTSCRIPT_CMAPS, &FT_PSCMAPS_INTERFACE_GET
)
@@ -563,7 +563,19 @@
psnames_get_service( FT_Module module,
const char* service_id )
{
+ /* FT_PSCMAPS_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_PSCMAPS_SERVICES_GET, service_id );
}
@@ -578,7 +590,7 @@
#endif
FT_DEFINE_MODULE(psnames_module_class,
-
+
0, /* this is not a font driver, nor a renderer */
sizeof ( FT_ModuleRec ),