Index: src/psnames/psmodule.c |
diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c |
index 361917415fa069878c40ec80eec50a25bfba90cd..0a5bcb7d2a1f85b1921332d552424e4b1a73902a 100644 |
--- a/src/psnames/psmodule.c |
+++ b/src/psnames/psmodule.c |
@@ -4,7 +4,7 @@ |
/* */ |
/* PSNames module implementation (body). */ |
/* */ |
-/* Copyright 1996-2001, 2002, 2003, 2005, 2006, 2007, 2008 by */ |
+/* Copyright 1996-2003, 2005-2008, 2012, 2013 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -17,6 +17,7 @@ |
#include <ft2build.h> |
+#include FT_INTERNAL_DEBUG_H |
#include FT_INTERNAL_OBJECTS_H |
#include FT_SERVICE_POSTSCRIPT_CMAPS_H |
@@ -369,7 +370,7 @@ |
/* No unicode chars here! */ |
FT_FREE( table->maps ); |
if ( !error ) |
- error = PSnames_Err_No_Unicode_Glyph_Name; |
+ error = FT_THROW( No_Unicode_Glyph_Name ); |
} |
else |
{ |
@@ -377,7 +378,7 @@ |
if ( count < num_glyphs / 2 ) |
{ |
(void)FT_RENEW_ARRAY( table->maps, num_glyphs, count ); |
- error = PSnames_Err_Ok; |
+ error = FT_Err_Ok; |
} |
/* Sort the table in increasing order of unicode values, */ |
@@ -521,7 +522,9 @@ |
#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, |
@@ -531,39 +534,36 @@ |
(PS_Adobe_Std_StringsFunc) ps_get_standard_strings, |
t1_standard_encoding, |
- t1_expert_encoding |
- ) |
+ t1_expert_encoding ) |
#else |
- FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface, |
- 0, |
- 0, |
- 0, |
- 0, |
+ FT_DEFINE_SERVICE_PSCMAPSREC( |
+ pscmaps_interface, |
+ NULL, |
+ NULL, |
+ NULL, |
+ NULL, |
(PS_Macintosh_NameFunc) ps_get_macintosh_name, |
(PS_Adobe_Std_StringsFunc) ps_get_standard_strings, |
t1_standard_encoding, |
- t1_expert_encoding |
- ) |
+ t1_expert_encoding ) |
#endif /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST */ |
- FT_DEFINE_SERVICEDESCREC1(pscmaps_services, |
- FT_SERVICE_ID_POSTSCRIPT_CMAPS, &FT_PSCMAPS_INTERFACE_GET |
- ) |
- |
- |
+ FT_DEFINE_SERVICEDESCREC1( |
+ pscmaps_services, |
+ FT_SERVICE_ID_POSTSCRIPT_CMAPS, &PSCMAPS_INTERFACE_GET ) |
static FT_Pointer |
psnames_get_service( FT_Module module, |
const char* service_id ) |
{ |
- /* FT_PSCMAPS_SERVICES_GET derefers `library' in PIC mode */ |
+ /* PSCMAPS_SERVICES_GET derefers `library' in PIC mode */ |
#ifdef FT_CONFIG_OPTION_PIC |
FT_Library library; |
@@ -577,19 +577,20 @@ |
FT_UNUSED( module ); |
#endif |
- return ft_service_list_lookup( FT_PSCMAPS_SERVICES_GET, service_id ); |
+ return ft_service_list_lookup( PSCMAPS_SERVICES_GET, service_id ); |
} |
#endif /* FT_CONFIG_OPTION_POSTSCRIPT_NAMES */ |
#ifndef FT_CONFIG_OPTION_POSTSCRIPT_NAMES |
-#define PUT_PS_NAMES_SERVICE(a) 0 |
+#define PUT_PS_NAMES_SERVICE( a ) NULL |
#else |
-#define PUT_PS_NAMES_SERVICE(a) a |
+#define PUT_PS_NAMES_SERVICE( a ) a |
#endif |
- FT_DEFINE_MODULE(psnames_module_class, |
+ FT_DEFINE_MODULE( |
+ psnames_module_class, |
0, /* this is not a font driver, nor a renderer */ |
sizeof ( FT_ModuleRec ), |
@@ -598,12 +599,11 @@ |
0x10000L, /* driver version */ |
0x20000L, /* driver requires FreeType 2 or above */ |
- PUT_PS_NAMES_SERVICE((void*)&FT_PSCMAPS_INTERFACE_GET), /* module specific interface */ |
- (FT_Module_Constructor)0, |
- (FT_Module_Destructor) 0, |
- (FT_Module_Requester) PUT_PS_NAMES_SERVICE(psnames_get_service) |
- ) |
- |
+ PUT_PS_NAMES_SERVICE( |
+ (void*)&PSCMAPS_INTERFACE_GET ), /* module specific interface */ |
+ (FT_Module_Constructor)NULL, |
+ (FT_Module_Destructor) NULL, |
+ (FT_Module_Requester) PUT_PS_NAMES_SERVICE( psnames_get_service ) ) |
/* END */ |