Commit 3c7c5da3bb3b4ac18e6af261c1712fb0f6d62799
2000-10-19T15:56:22
added development header files to CONFIG_H in the makefiles increased T1_MAX_CHARSTRINGS_OPERANDS (again) to 256 -- one glyph of the Chinese MingTiEG-Medium needs it that large
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
diff --git a/builds/cygwin/devel/freetype/config/ftoption.h b/builds/cygwin/devel/freetype/config/ftoption.h
index a06648b..03faeb3 100644
--- a/builds/cygwin/devel/freetype/config/ftoption.h
+++ b/builds/cygwin/devel/freetype/config/ftoption.h
@@ -357,7 +357,9 @@
/* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity. A */
/* minimum of 16 is required. */
/* */
-#define T1_MAX_CHARSTRINGS_OPERANDS 64
+ /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
+ /* */
+#define T1_MAX_CHARSTRINGS_OPERANDS 256
/*************************************************************************/
diff --git a/builds/freetype.mk b/builds/freetype.mk
index ab16bd5..67489ff 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -154,7 +154,8 @@ OBJECTS_LIST :=
#
PUBLIC_H := $(wildcard $(PUBLIC_)*.h)
BASE_H := $(wildcard $(INTERNAL_)*.h)
-CONFIG_H := $(wildcard $(CONFIG_)*.h)
+CONFIG_H := $(wildcard $(CONFIG_)*.h) \
+ $(wildcard $(BUILD)$(SEP)freetype$(SEP)config$(SEP)*.h)
CACHE_H := $(wildcard $(CACHE_)*.h)
FREETYPE_H := $(PUBLIC_H) $(BASE_H) $(CONFIG_H) $(CACHE_H)
diff --git a/builds/unix/devel/freetype/config/ftoption.h b/builds/unix/devel/freetype/config/ftoption.h
index a06648b..03faeb3 100644
--- a/builds/unix/devel/freetype/config/ftoption.h
+++ b/builds/unix/devel/freetype/config/ftoption.h
@@ -357,7 +357,9 @@
/* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity. A */
/* minimum of 16 is required. */
/* */
-#define T1_MAX_CHARSTRINGS_OPERANDS 64
+ /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
+ /* */
+#define T1_MAX_CHARSTRINGS_OPERANDS 256
/*************************************************************************/
diff --git a/builds/unix/unixddef.mk b/builds/unix/unixddef.mk
index 242e965..0ddc6c5 100644
--- a/builds/unix/unixddef.mk
+++ b/builds/unix/unixddef.mk
@@ -22,7 +22,8 @@ TOP := $(shell cd $(TOP); pwd)
DELETE := rm -f
SEP := /
HOSTSEP := $(SEP)
-BUILD := $(TOP)/builds/unix/devel # we use a special devel ftoption.h
+# we use a special devel ftoption.h
+BUILD := $(TOP)/builds/unix/devel
# do not set the platform to `unix', or libtool will trick you
PLATFORM := unixdev
diff --git a/builds/win32/devel/freetype/config/ftoption.h b/builds/win32/devel/freetype/config/ftoption.h
index a06648b..8b09800 100644
--- a/builds/win32/devel/freetype/config/ftoption.h
+++ b/builds/win32/devel/freetype/config/ftoption.h
@@ -357,6 +357,8 @@
/* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity. A */
/* minimum of 16 is required. */
/* */
+ /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
+ /* */
#define T1_MAX_CHARSTRINGS_OPERANDS 64
diff --git a/builds/win32/w32-dev.mk b/builds/win32/w32-dev.mk
index fc3ed10..28146d8 100644
--- a/builds/win32/w32-dev.mk
+++ b/builds/win32/w32-dev.mk
@@ -23,7 +23,9 @@ ifndef TOP
TOP := .
endif
-SEP := /
+SEP := /
+BUILD := $(TOP)/builds/win32/devel
+
include $(TOP)/builds/win32/win32-def.mk
include $(TOP)/builds/compiler/gcc-dev.mk
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index d512587..2e4330d 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -357,7 +357,9 @@
/* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity. A */
/* minimum of 16 is required. */
/* */
-#define T1_MAX_CHARSTRINGS_OPERANDS 64
+ /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
+ /* */
+#define T1_MAX_CHARSTRINGS_OPERANDS 256
/*************************************************************************/
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index 0e70de4..83ac00c 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -520,9 +520,6 @@
#if 0
-#define T1_MAX_CHARSTRINGS_OPERANDS 64
-#define T1_MAX_SUBRS_CALLS 16
-
/*************************************************************************/
/* */
/* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine */