ref: 5fe4c00ed29e6d85f348a79d2dfd9ea8f9a88b27
parent: c3dd151b0f5401a603e66c13ec5a11655754b385
author: David Turner <[email protected]>
date: Wed Jul 26 15:04:08 EDT 2000
- fixed the incorrect SO extension for Visual C++ - disabled the TrueType interpreter by default - disabled the "type1" driver, "type1z" is now used by default (the internal driver name is "type1" now !!)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
LATEST CHANGES
+ - updates to the build system. We now compile the library correctly
+ under Unix system through "configure" which is automatically called
+ on the first "make" invocation.
+
+ - added the auto-hinting module !!. Fixing some bugs here and there..
+
- found some bugs in the composite loader (seac) of the Type1-based
font drivers..
--- a/builds/win32/w32-vcc.mk
+++ b/builds/win32/w32-vcc.mk
@@ -49,7 +49,7 @@
# .o, .tco, .obj, etc., depending on the platform.
#
O := obj
-SO := ojc
+SO := obj
# The library file extension (for standard and static libraries). This can
# be .a, .lib, etc., depending on the platform.
--- a/include/freetype/config/ftmodule.h
+++ b/include/freetype/config/ftmodule.h
@@ -7,5 +7,4 @@
FT_USE_MODULE(ft_smooth_renderer_class)
FT_USE_MODULE(tt_driver_class)
FT_USE_MODULE(t1_driver_class)
-FT_USE_MODULE(t1z_driver_class)
FT_USE_MODULE(winfnt_driver_class)
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -305,7 +305,7 @@
/* By undefining this, you will only compile the code necessary to load */
/* TrueType glyphs without hinting. */
/* */
-#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
/*************************************************************************/
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -435,7 +435,11 @@
{ft_module_font_driver |
ft_module_driver_scalable |
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
ft_module_driver_has_hinter,
+#else
+ 0,
+#endif
sizeof ( TT_DriverRec ),
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -639,7 +639,9 @@
load->pp2 = zone->cur[n_points - 1];
}
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
Exit:
+#endif
return error;
}
@@ -796,7 +798,7 @@
#else
- error = Process_Simple_Glyph( loader, 0 );
+ error = TT_Process_Simple_Glyph( loader, 0 );
#endif
--- a/src/type1/module.mk
+++ /dev/null
@@ -1,6 +1,0 @@
-make_module_list: add_type1_driver
-
-add_type1_driver:
- $(OPEN_DRIVER)t1_driver_class$(CLOSE_DRIVER)
- $(ECHO_DRIVER)type1 $(ECHO_DRIVER_DESC)Postscript font files with extension *.pfa or *.pfb$(ECHO_DRIVER_DONE)
-
--- /dev/null
+++ b/src/type1/module.mk0
@@ -1,0 +1,6 @@
+make_module_list: add_type1_driver
+
+add_type1_driver:
+ $(OPEN_DRIVER)t1_driver_class$(CLOSE_DRIVER)
+ $(ECHO_DRIVER)type1 $(ECHO_DRIVER_DESC)Postscript font files with extension *.pfa or *.pfb$(ECHO_DRIVER_DONE)
+
--- a/src/type1/rules.mk
+++ /dev/null
@@ -1,74 +1,0 @@
-#
-# FreeType 2 Type 1 driver configuration rules
-#
-
-
-# Copyright 1996-2000 by
-# David Turner, Robert Wilhelm, and Werner Lemberg.
-#
-# This file is part of the FreeType project, and may only be used, modified,
-# and distributed under the terms of the FreeType project license,
-# LICENSE.TXT. By continuing to use, modify, or distribute this file you
-# indicate that you have read the license and understand and accept it
-# fully.
-
-
-# Type1 driver directory
-#
-T1_DIR := $(SRC_)type1
-T1_DIR_ := $(T1_DIR)$(SEP)
-
-
-# compilation flags for the driver
-#
-T1_COMPILE := $(FT_COMPILE)
-
-
-# Type1 driver sources (i.e., C files)
-#
-T1_DRV_SRC := $(T1_DIR_)t1objs.c \
- $(T1_DIR_)t1load.c \
- $(T1_DIR_)t1parse.c \
- $(T1_DIR_)t1tokens.c \
- $(T1_DIR_)t1driver.c \
- $(T1_DIR_)t1hinter.c \
- $(T1_DIR_)t1afm.c \
- $(T1_DIR_)t1gload.c
-
-# Type1 driver headers
-#
-T1_DRV_H := $(T1_DRV_SRC:%.c=%.h)
-
-
-# Type1 driver object(s)
-#
-# T1_DRV_OBJ_M is used during `multi' builds
-# T1_DRV_OBJ_S is used during `single' builds
-#
-T1_DRV_OBJ_M := $(T1_DRV_SRC:$(T1_DIR_)%.c=$(OBJ_)%.$O)
-T1_DRV_OBJ_S := $(OBJ_)type1.$O
-
-# Type1 driver source file for single build
-#
-T1_DRV_SRC_S := $(T1_DIR_)type1.c
-
-
-# Type1 driver - single object
-#
-$(T1_DRV_OBJ_S): $(T1_DRV_SRC_S) $(T1_DRV_SRC) $(FREETYPE_H) $(T1_DRV_H)
- $(T1_COMPILE) $T$@ $(T1_DRV_SRC_S)
-
-
-# Type1 driver - multiple objects
-#
-$(OBJ_)%.$O: $(T1_DIR_)%.c $(FREETYPE_H) $(T1_DRV_H)
- $(T1_COMPILE) $T$@ $<
-
-
-# update main driver object lists
-#
-DRV_OBJS_S += $(T1_DRV_OBJ_S)
-DRV_OBJS_M += $(T1_DRV_OBJ_M)
-
-
-# EOF
--- /dev/null
+++ b/src/type1/rules.mk0
@@ -1,0 +1,74 @@
+#
+# FreeType 2 Type 1 driver configuration rules
+#
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT. By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
+# Type1 driver directory
+#
+T1_DIR := $(SRC_)type1
+T1_DIR_ := $(T1_DIR)$(SEP)
+
+
+# compilation flags for the driver
+#
+T1_COMPILE := $(FT_COMPILE)
+
+
+# Type1 driver sources (i.e., C files)
+#
+T1_DRV_SRC := $(T1_DIR_)t1objs.c \
+ $(T1_DIR_)t1load.c \
+ $(T1_DIR_)t1parse.c \
+ $(T1_DIR_)t1tokens.c \
+ $(T1_DIR_)t1driver.c \
+ $(T1_DIR_)t1hinter.c \
+ $(T1_DIR_)t1afm.c \
+ $(T1_DIR_)t1gload.c
+
+# Type1 driver headers
+#
+T1_DRV_H := $(T1_DRV_SRC:%.c=%.h)
+
+
+# Type1 driver object(s)
+#
+# T1_DRV_OBJ_M is used during `multi' builds
+# T1_DRV_OBJ_S is used during `single' builds
+#
+T1_DRV_OBJ_M := $(T1_DRV_SRC:$(T1_DIR_)%.c=$(OBJ_)%.$O)
+T1_DRV_OBJ_S := $(OBJ_)type1.$O
+
+# Type1 driver source file for single build
+#
+T1_DRV_SRC_S := $(T1_DIR_)type1.c
+
+
+# Type1 driver - single object
+#
+$(T1_DRV_OBJ_S): $(T1_DRV_SRC_S) $(T1_DRV_SRC) $(FREETYPE_H) $(T1_DRV_H)
+ $(T1_COMPILE) $T$@ $(T1_DRV_SRC_S)
+
+
+# Type1 driver - multiple objects
+#
+$(OBJ_)%.$O: $(T1_DIR_)%.c $(FREETYPE_H) $(T1_DRV_H)
+ $(T1_COMPILE) $T$@ $<
+
+
+# update main driver object lists
+#
+DRV_OBJS_S += $(T1_DRV_OBJ_S)
+DRV_OBJS_M += $(T1_DRV_OBJ_M)
+
+
+# EOF
--- a/src/type1z/module.mk
+++ b/src/type1z/module.mk
@@ -1,7 +1,7 @@
-make_module_list: add_type1z_driver
+make_module_list: add_type1_driver
-add_type1z_driver:
- $(OPEN_DRIVER)t1z_driver_class$(CLOSE_DRIVER)
- $(ECHO_DRIVER)type1z $(ECHO_DRIVER_DESC)Postscript font files with extension *.pfa or *.pfb$(ECHO_DRIVER_DONE)
+add_type1_driver:
+ $(OPEN_DRIVER)t1_driver_class$(CLOSE_DRIVER)
+ $(ECHO_DRIVER)type1 $(ECHO_DRIVER_DESC)Postscript font files with extension *.pfa or *.pfb$(ECHO_DRIVER_DONE)
# EOF
--- a/src/type1z/z1driver.c
+++ b/src/type1z/z1driver.c
@@ -283,13 +283,13 @@
}
- const FT_Driver_Class t1z_driver_class =
+ const FT_Driver_Class t1_driver_class =
{ {ft_module_font_driver | ft_module_driver_scalable,
sizeof( FT_DriverRec ),
- "type1z",
+ "type1",
0x10000L,
0x20000L,
--- a/src/type1z/z1driver.h
+++ b/src/type1z/z1driver.h
@@ -21,7 +21,7 @@
#include <freetype/internal/ftdriver.h>
- FT_EXPORT_VAR( const FT_Driver_Class ) t1z_driver_class;
+ FT_EXPORT_VAR( const FT_Driver_Class ) t1_driver_class;
#endif /* Z1DRIVER_H */