Commit fcf5e686500367912612a5d53e35037324c83bd0
2000-08-24T00:30:24
renamed "psmodule.c" to "psauxmod.c"
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253
diff --git a/src/psaux/psaux.c b/src/psaux/psaux.c
index 07f5238..502d230 100644
--- a/src/psaux/psaux.c
+++ b/src/psaux/psaux.c
@@ -21,13 +21,13 @@
#ifdef FT_FLAT_COMPILE
#include "psobjs.c"
-#include "psmodule.c"
+#include "psquxmod.c"
#include "t1decode.c"
#else
#include <psaux/psobjs.c>
-#include <psaux/psmodule.c>
+#include <psaux/psauxmod.c>
#include <psaux/t1decode.c>
#endif
diff --git a/src/psaux/psauxmod.c b/src/psaux/psauxmod.c
new file mode 100644
index 0000000..8f76381
--- /dev/null
+++ b/src/psaux/psauxmod.c
@@ -0,0 +1,82 @@
+#include <psaux/psauxmod.h>
+#include <psaux/psobjs.h>
+#include <psaux/t1decode.h>
+
+ LOCAL_FUNC
+ const PS_Table_Funcs ps_table_funcs =
+ {
+ PS_Table_New,
+ PS_Table_Done,
+ PS_Table_Add,
+ PS_Table_Release
+ };
+
+
+ LOCAL_FUNC
+ const T1_Parser_Funcs t1_parser_funcs =
+ {
+ T1_Init_Parser,
+ T1_Done_Parser,
+ T1_Skip_Spaces,
+ T1_Skip_Alpha,
+ T1_ToInt,
+ T1_ToFixed,
+ T1_ToCoordArray,
+ T1_ToFixedArray,
+ T1_ToToken,
+ T1_ToTokenArray,
+ T1_Load_Field,
+ T1_Load_Field_Table
+ };
+
+
+ LOCAL_FUNC
+ const T1_Builder_Funcs t1_builder_funcs =
+ {
+ T1_Builder_Init,
+ T1_Builder_Done,
+ T1_Builder_Check_Points,
+ T1_Builder_Add_Point,
+ T1_Builder_Add_Point1,
+ T1_Builder_Add_Contour,
+ T1_Builder_Start_Point,
+ T1_Builder_Close_Contour
+ };
+
+
+ LOCAL_FUNC
+ const T1_Decoder_Funcs t1_decoder_funcs =
+ {
+ T1_Decoder_Init,
+ T1_Decoder_Done,
+ T1_Decoder_Parse_Charstrings
+ };
+
+
+ LOCAL_FUNC
+ const PSAux_Interface psaux_interface =
+ {
+ &ps_table_funcs,
+ &t1_parser_funcs,
+ &t1_builder_funcs,
+ &t1_decoder_funcs,
+
+ T1_Decrypt
+ };
+
+
+ FT_CPLUSPLUS(const FT_Module_Class) psaux_module_class =
+ {
+ 0,
+ sizeof( FT_ModuleRec ),
+ "psaux",
+ 0x10000L,
+ 0x20000L,
+
+ &psaux_interface, /* module-specific interface */
+
+ (FT_Module_Constructor) 0,
+ (FT_Module_Destructor) 0,
+ (FT_Module_Requester) 0
+ };
+
diff --git a/src/psaux/psauxmod.h b/src/psaux/psauxmod.h
new file mode 100644
index 0000000..a5b33c1
--- /dev/null
+++ b/src/psaux/psauxmod.h
@@ -0,0 +1,16 @@
+#ifndef PSAUXMOD_H
+#define PSAUXMOD_H
+
+#include <freetype/ftmodule.h>
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+ FT_EXPORT_VAR( const FT_Module_Class ) psaux_driver_class;
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* PSAUXMOD_H */
diff --git a/src/psaux/psmodule.c b/src/psaux/psmodule.c
deleted file mode 100644
index 6051b04..0000000
--- a/src/psaux/psmodule.c
+++ /dev/null
@@ -1,82 +0,0 @@
-#include <psaux/psmodule.h>
-#include <psaux/psobjs.h>
-#include <psaux/t1decode.h>
-
- LOCAL_FUNC
- const PS_Table_Funcs ps_table_funcs =
- {
- PS_Table_New,
- PS_Table_Done,
- PS_Table_Add,
- PS_Table_Release
- };
-
-
- LOCAL_FUNC
- const T1_Parser_Funcs t1_parser_funcs =
- {
- T1_Init_Parser,
- T1_Done_Parser,
- T1_Skip_Spaces,
- T1_Skip_Alpha,
- T1_ToInt,
- T1_ToFixed,
- T1_ToCoordArray,
- T1_ToFixedArray,
- T1_ToToken,
- T1_ToTokenArray,
- T1_Load_Field,
- T1_Load_Field_Table
- };
-
-
- LOCAL_FUNC
- const T1_Builder_Funcs t1_builder_funcs =
- {
- T1_Builder_Init,
- T1_Builder_Done,
- T1_Builder_Check_Points,
- T1_Builder_Add_Point,
- T1_Builder_Add_Point1,
- T1_Builder_Add_Contour,
- T1_Builder_Start_Point,
- T1_Builder_Close_Contour
- };
-
-
- LOCAL_FUNC
- const T1_Decoder_Funcs t1_decoder_funcs =
- {
- T1_Decoder_Init,
- T1_Decoder_Done,
- T1_Decoder_Parse_Charstrings
- };
-
-
- LOCAL_FUNC
- const PSAux_Interface psaux_interface =
- {
- &ps_table_funcs,
- &t1_parser_funcs,
- &t1_builder_funcs,
- &t1_decoder_funcs,
-
- T1_Decrypt
- };
-
-
- FT_CPLUSPLUS(const FT_Module_Class) psaux_module_class =
- {
- 0,
- sizeof( FT_ModuleRec ),
- "psaux",
- 0x10000L,
- 0x20000L,
-
- &psaux_interface, /* module-specific interface */
-
- (FT_Module_Constructor) 0,
- (FT_Module_Destructor) 0,
- (FT_Module_Requester) 0
- };
-
diff --git a/src/psaux/psmodule.h b/src/psaux/psmodule.h
deleted file mode 100644
index 41e3159..0000000
--- a/src/psaux/psmodule.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef PSMODULE_H
-#define PSMODULE_H
-
-#include <freetype/ftmodule.h>
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
- FT_EXPORT_VAR( const FT_Module_Class ) psaux_driver_class;
-
-#ifdef __cplusplus
- }
-#endif
-
-#endif /* PSMODULE_H */
diff --git a/src/psaux/rules.mk b/src/psaux/rules.mk
index 896013a..b314a05 100644
--- a/src/psaux/rules.mk
+++ b/src/psaux/rules.mk
@@ -28,7 +28,7 @@ PSAUX_COMPILE := $(FT_COMPILE)
#
PSAUX_DRV_SRC := $(PSAUX_DIR_)psobjs.c \
$(PSAUX_DIR_)t1decode.c \
- $(PSAUX_DIR_)psmodule.c
+ $(PSAUX_DIR_)psauxmod.c
# PSAUX driver headers
#