ref: 4c6234d963bb7543503eee63dcf32aa35dbf9c91
parent: ed70ca5a0f62da7bc24fa2c868fd855df068e45c
author: Wu, Chia-I (吳佳一) <[email protected]>
date: Mon Jan 23 05:46:38 EST 2006
* src/psaux/psaux.c src/psaux/psauxmod.c src/type1/t1driver.c: Make AFM parser optional, controlled by `T1_CONFIG_OPTION_NO_AFM'.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-23 Chia-I Wu <[email protected]>
+
+ * src/psaux/psaux.c src/psaux/psauxmod.c src/type1/t1driver.c: Make
+ AFM parser optional, controlled by `T1_CONFIG_OPTION_NO_AFM'.
+
2006-01-22 Werner Lemberg <[email protected]>
* builds/unix/install-sh, builds/unix/mkinstalldirs: Updated from
--- a/src/psaux/psaux.c
+++ b/src/psaux/psaux.c
@@ -23,7 +23,11 @@
#include "psauxmod.c"
#include "t1decode.c"
#include "t1cmap.c"
+
+#ifndef T1_CONFIG_OPTION_NO_AFM
#include "afmparse.c"
+#endif
+
#include "psconv.c"
--- a/src/psaux/psauxmod.c
+++ b/src/psaux/psauxmod.c
@@ -21,7 +21,10 @@
#include "psobjs.h"
#include "t1decode.h"
#include "t1cmap.h"
+
+#ifndef T1_CONFIG_OPTION_NO_AFM
#include "afmparse.h"
+#endif
FT_CALLBACK_TABLE_DEF
@@ -76,6 +79,7 @@
};
+#ifndef T1_CONFIG_OPTION_NO_AFM
FT_CALLBACK_TABLE_DEF
const AFM_Parser_FuncsRec afm_parser_funcs =
{@@ -83,6 +87,7 @@
afm_parser_done,
afm_parser_parse
};
+#endif
FT_CALLBACK_TABLE_DEF
@@ -102,7 +107,11 @@
&ps_parser_funcs,
&t1_builder_funcs,
&t1_decoder_funcs,
+#ifndef T1_CONFIG_OPTION_NO_AFM
&afm_parser_funcs,
+#else
+ 0,
+#endif
t1_decrypt,
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -178,10 +178,12 @@
(PS_GetFontPrivateFunc)t1_ps_get_font_private,
};
+#ifndef T1_CONFIG_OPTION_NO_AFM
static const FT_Service_KerningRec t1_service_kerning =
{T1_Get_Track_Kerning,
};
+#endif
/*
* SERVICE LIST
@@ -194,7 +196,10 @@
{ FT_SERVICE_ID_GLYPH_DICT, &t1_service_glyph_dict }, { FT_SERVICE_ID_XF86_NAME, FT_XF86_FORMAT_TYPE_1 }, { FT_SERVICE_ID_POSTSCRIPT_INFO, &t1_service_ps_info },+
+#ifndef T1_CONFIG_OPTION_NO_AFM
{ FT_SERVICE_ID_KERNING, &t1_service_kerning },+#endif
#ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT
{ FT_SERVICE_ID_MULTI_MASTERS, &t1_service_multi_masters },