ref: fcf5e686500367912612a5d53e35037324c83bd0
parent: 888706a317b930cb94314d7803a61426c0fbf46c
author: David Turner <[email protected]>
date: Wed Aug 23 20:30:24 EDT 2000
renamed "psmodule.c" to "psauxmod.c"
--- 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
--- /dev/null
+++ b/src/psaux/psauxmod.c
@@ -1,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
+ };
+
--- /dev/null
+++ b/src/psaux/psauxmod.h
@@ -1,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 */
--- a/src/psaux/psmodule.c
+++ /dev/null
@@ -1,82 +1,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
- };
-
--- a/src/psaux/psmodule.h
+++ /dev/null
@@ -1,16 +1,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 */
--- a/src/psaux/rules.mk
+++ b/src/psaux/rules.mk
@@ -28,7 +28,7 @@
#
PSAUX_DRV_SRC := $(PSAUX_DIR_)psobjs.c \
$(PSAUX_DIR_)t1decode.c \
- $(PSAUX_DIR_)psmodule.c
+ $(PSAUX_DIR_)psauxmod.c
# PSAUX driver headers
#