Commit 7f7aadf4f7edfd29e0b9879791f897464d1d9e9f
2000-03-13T12:57:27
finished moving all configuration macros to "config/ftoption.h"
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 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585
diff --git a/src/base/ftextend.c b/src/base/ftextend.c
index 20691b6..9bbe0bf 100644
--- a/src/base/ftextend.c
+++ b/src/base/ftextend.c
@@ -25,7 +25,6 @@
/*************************************************************************/
#include <ftextend.h>
-#include <ftobjs.h>
/* required by the tracing mode */
#undef FT_COMPONENT
diff --git a/src/base/ftextend.h b/src/base/ftextend.h
index b3e0c54..ddd891d 100644
--- a/src/base/ftextend.h
+++ b/src/base/ftextend.h
@@ -18,7 +18,6 @@
#ifndef FTEXTEND_H
#define FTEXTEND_H
-#include <ftconfig.h>
#include <ftobjs.h>
diff --git a/src/sfnt/rules.mk b/src/sfnt/rules.mk
index 0880dc2..e67e4ff 100644
--- a/src/sfnt/rules.mk
+++ b/src/sfnt/rules.mk
@@ -46,7 +46,6 @@ ifndef SFNT_INCLUDE
# driver headers
#
SFNT_DRV_H := $(SHARED_H) \
- $(SFNT_DIR_)sfconfig.h \
$(SFNT_DIR_)ttload.h \
$(SFNT_DIR_)ttsbit.h \
$(SFNT_DIR_)ttcmap.h \
diff --git a/src/sfnt/sfconfig.h b/src/sfnt/sfconfig.h
deleted file mode 100644
index fc36070..0000000
--- a/src/sfnt/sfconfig.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/***************************************************************************/
-/* */
-/* sfconfig.h */
-/* */
-/* the `sfnt' driver configuration file. */
-/* */
-/* Copyright 1996-1999 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. */
-/* */
-/***************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* This file is used to configure various aspects of the TrueType */
- /* driver. */
- /* */
- /*************************************************************************/
-
-
-#ifndef SFCONFIG_H
-#define SFCONFIG_H
-
-
-#if 0
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_EMBEDDED_BITMAPS if you want to support */
- /* embedded bitmaps in the TrueType/OpenType driver. */
- /* */
-#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-
-
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to */
- /* load and enumerate the glyph Postscript names in a TrueType or */
- /* OpenType file. */
- /* */
- /* Note that if FT_CONFIG_OPTION_POSTSCRIPT_NAMES is also defined, */
- /* the TrueType driver will use the "psnames" module to fetch the */
- /* glyph names. */
- /* */
- /* Otherwise, the driver will provide its own set of glyph names to */
- /* be built without the "psnames" module. */
- /* */
-#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
-#endif
-
-
-#endif /* SFCONFIG_H */
-
-
-/* END */
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index 0d187f3..93472d9 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -3,7 +3,6 @@
#include <ttsbit.h>
#include <ttpost.h>
#include <ttcmap.h>
-#include <sfconfig.h>
#include <sfnt.h>
static const SFNT_Interface sfnt_interface =
diff --git a/src/sfnt/sfnt.c b/src/sfnt/sfnt.c
index cdf2c02..319659a 100644
--- a/src/sfnt/sfnt.c
+++ b/src/sfnt/sfnt.c
@@ -1,6 +1,5 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
-#include <sfconfig.h>
#include <ttload.c>
#include <ttcmap.c>
diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c
index 45df713..c40ec8d 100644
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -22,6 +22,7 @@
#include <ftdebug.h>
+#include <ftconfig.h>
#include <ttload.h>
#include <tttags.h>
diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c
index 07a6c08..b55eb5b 100644
--- a/src/sfnt/ttpost.c
+++ b/src/sfnt/ttpost.c
@@ -24,9 +24,9 @@
/* */
/*************************************************************************/
+#include <ftstream.h>
#include <ttpost.h>
-#include <ftstream.h>
#include <tterrors.h>
#include <ttload.h>
#include <tttags.h>
diff --git a/src/truetype/rules.mk b/src/truetype/rules.mk
index 94678b7..8ed78a7 100644
--- a/src/truetype/rules.mk
+++ b/src/truetype/rules.mk
@@ -52,7 +52,6 @@ TT_DRV_SRC := $(TT_DIR_)ttobjs.c \
# driver headers
#
TT_DRV_H := $(SFNT_H) \
- $(TT_DIR_)ttconfig.h \
$(TT_DRV_SRC:%.c=%.h)
diff --git a/src/truetype/ttconfig.h b/src/truetype/ttconfig.h
deleted file mode 100644
index 9a797ea..0000000
--- a/src/truetype/ttconfig.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/***************************************************************************/
-/* */
-/* ttconfig.h */
-/* */
-/* TrueType configuration file (specification only). */
-/* */
-/* Copyright 1996-1999 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. */
-/* */
-/***************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* This file is used to configure various aspects of the TrueType */
- /* driver. */
- /* */
- /*************************************************************************/
-
-
-#ifndef TTCONFIG_H
-#define TTCONFIG_H
-
-#if 0
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_BYTECODE_INTERPRETER if you want to compile */
- /* a bytecode interpreter in the TrueType driver. Note that there are */
- /* important patent issues related to the use of the interpreter. */
- /* */
- /* By undefining this, you'll only compile the code necessary to load */
- /* TrueType glyphs without hinting.. */
- /* */
-#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType */
- /* bytecode interpreter with a huge switch statement, rather than a */
- /* call table. This results in smaller and faster code for a number of */
- /* architectures. */
- /* */
- /* Note however that on some compiler/processor combinations, undefining */
- /* this macro will generate a faster, though larger, code. */
- /* */
-#define TT_CONFIG_OPTION_INTERPRETER_SWITCH
-
-
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_EMBEDDED_BITMAPS if you want to support */
- /* embedded bitmaps in the TrueType/OpenType driver. */
- /* */
-#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-
-
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to */
- /* load and enumerate the glyph Postscript names in a TrueType or */
- /* OpenType file. */
- /* */
-#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
-
- /* The maximum number of sub-glyphs in a TrueType composite glyph */
-#define TT_MAX_SUBGLYPHS 32
-
-#define TT_USE_FIXED
-#endif
-
-#endif /* TTCONFIG_H */
-
-
-/* END */
diff --git a/src/truetype/ttdriver.h b/src/truetype/ttdriver.h
index 199934f..062e701 100644
--- a/src/truetype/ttdriver.h
+++ b/src/truetype/ttdriver.h
@@ -27,7 +27,7 @@
EXPORT_DEF
- const FT_DriverInterface ttz_driver_interface;
+ const FT_DriverInterface tt_driver_interface;
#endif /* TTDRIVER_H */
diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h
index 8dd990f..e22d3f6 100644
--- a/src/truetype/ttobjs.h
+++ b/src/truetype/ttobjs.h
@@ -22,7 +22,6 @@
#include <ftobjs.h>
#include <tttypes.h>
-#include <ttconfig.h>
#include <tterrors.h>
diff --git a/src/type1/rules.mk b/src/type1/rules.mk
index dba40a2..3680523 100644
--- a/src/type1/rules.mk
+++ b/src/type1/rules.mk
@@ -109,7 +109,6 @@ T1_DRV_SRC := $(T1_DIR_)t1objs.c \
# Type1 driver headers
#
T1_DRV_H := $(T1_DIR_)t1errors.h \
- $(T1_DIR_)t1config.h \
$(T1SHARED_H) \
$(T1_DRV_SRC:%.c=%.h)
diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c
index f619e28..036aa5e 100644
--- a/src/type1/t1afm.c
+++ b/src/type1/t1afm.c
@@ -10,12 +10,14 @@
#include <t1types.h>
#include <stdlib.h> /* for qsort */
+#if 0
LOCAL_FUNC
void T1_Done_AFM( FT_Memory memory, T1_AFM* afm )
{
FREE( afm->kern_pairs );
afm->num_pairs = 0;
}
+#endif
#undef IS_KERN_PAIR
#define IS_KERN_PAIR(p) ( p[0] == 'K' && p[1] == 'P' )
diff --git a/src/type1/t1afm.h b/src/type1/t1afm.h
index 567ed63..366c2f2 100644
--- a/src/type1/t1afm.h
+++ b/src/type1/t1afm.h
@@ -34,9 +34,11 @@ LOCAL_DEF
FT_Error T1_Read_AFM( FT_Face face,
FT_Stream stream );
+#if 0
LOCAL_DEF
void T1_Done_AFM( FT_Memory memory,
T1_AFM* afm );
+#endif
LOCAL_DEF
void T1_Get_Kerning( T1_AFM* afm,
diff --git a/src/type1/t1config.h b/src/type1/t1config.h
deleted file mode 100644
index cc546d0..0000000
--- a/src/type1/t1config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************
- *
- * t1config.h
- *
- * Type 1 driver configuration file
- *
- * Copyright 1996-1998 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.
- *
- ******************************************************************/
-
-#ifndef T1CONFIG_H
-#define T1CONFIG_H
-
-#if 0
-/* T1_MAX_STACK_DEPTH is the maximal depth of the token stack used */
-/* by the Type 1 parser (see t1load.c). A minimum of 16 is required */
-/* */
-#define T1_MAX_STACK_DEPTH 16
-
-/* T1_MAX_DICT_DEPTH is the maximal depth of nest dictionaries and */
-/* arrays in the Type 1 stream (see t1load.c). A minimum of 4 is */
-/* required */
-#define T1_MAX_DICT_DEPTH 5
-
-/* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine */
-/* calls during glyph loading */
-#define T1_MAX_SUBRS_CALLS 8
-
-
-/* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity */
-#define T1_MAX_CHARSTRINGS_OPERANDS 32
-
-
-/* Define T1_CONFIG_OPTION_DISABLE_HINTER if you want to generate */
-/* a driver with no hinter. This can be useful to debug the parser */
-/* */
-#undef T1_CONFIG_OPTION_DISABLE_HINTER
-
-/* Define this configuration macro if you want to prevent the */
-/* compilation of "t1afm", which is in charge of reading Type1 */
-/* AFM files into an existing face. Note that when set, the T1 */
-/* driver will be unable to produce kerning distances.. */
-/* */
-#undef T1_CONFIG_OPTION_NO_AFM
-#endif
-
-#endif /* T1CONFIG_H */
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index 13e3418..3c2e5c2 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -1,8 +1,8 @@
+#include <ftconfig.h>
#include <ftdebug.h>
#include <t1types.h>
#include <t1tokens.h>
-#include <t1config.h>
#include <t1parse.h>
#include <stdio.h>
diff --git a/src/type1/t1objs.h b/src/type1/t1objs.h
index 417ae53..e11a3a1 100644
--- a/src/type1/t1objs.h
+++ b/src/type1/t1objs.h
@@ -19,7 +19,8 @@
#define T1OBJS_H
#include <ftobjs.h>
-#include <t1config.h>
+#include <ftconfig.h>
+
#include <t1errors.h>
#include <t1types.h>
diff --git a/src/type1z/rules.mk b/src/type1z/rules.mk
index a73a306..b902201 100644
--- a/src/type1z/rules.mk
+++ b/src/type1z/rules.mk
@@ -49,7 +49,6 @@ T1Z_DRV_SRC := $(T1Z_DIR_)t1parse.c \
# Type1 driver headers
#
T1Z_DRV_H := $(T1Z_DIR_)t1errors.h \
- $(T1Z_DIR_)t1config.h \
$(T1SHARED_H) \
$(T1Z_DRV_SRC:%.c=%.h)
diff --git a/src/type1z/t1afm.c b/src/type1z/t1afm.c
index f619e28..036aa5e 100644
--- a/src/type1z/t1afm.c
+++ b/src/type1z/t1afm.c
@@ -10,12 +10,14 @@
#include <t1types.h>
#include <stdlib.h> /* for qsort */
+#if 0
LOCAL_FUNC
void T1_Done_AFM( FT_Memory memory, T1_AFM* afm )
{
FREE( afm->kern_pairs );
afm->num_pairs = 0;
}
+#endif
#undef IS_KERN_PAIR
#define IS_KERN_PAIR(p) ( p[0] == 'K' && p[1] == 'P' )
diff --git a/src/type1z/t1afm.h b/src/type1z/t1afm.h
index 567ed63..366c2f2 100644
--- a/src/type1z/t1afm.h
+++ b/src/type1z/t1afm.h
@@ -34,9 +34,11 @@ LOCAL_DEF
FT_Error T1_Read_AFM( FT_Face face,
FT_Stream stream );
+#if 0
LOCAL_DEF
void T1_Done_AFM( FT_Memory memory,
T1_AFM* afm );
+#endif
LOCAL_DEF
void T1_Get_Kerning( T1_AFM* afm,
diff --git a/src/type1z/t1config.h b/src/type1z/t1config.h
deleted file mode 100644
index cc546d0..0000000
--- a/src/type1z/t1config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************
- *
- * t1config.h
- *
- * Type 1 driver configuration file
- *
- * Copyright 1996-1998 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.
- *
- ******************************************************************/
-
-#ifndef T1CONFIG_H
-#define T1CONFIG_H
-
-#if 0
-/* T1_MAX_STACK_DEPTH is the maximal depth of the token stack used */
-/* by the Type 1 parser (see t1load.c). A minimum of 16 is required */
-/* */
-#define T1_MAX_STACK_DEPTH 16
-
-/* T1_MAX_DICT_DEPTH is the maximal depth of nest dictionaries and */
-/* arrays in the Type 1 stream (see t1load.c). A minimum of 4 is */
-/* required */
-#define T1_MAX_DICT_DEPTH 5
-
-/* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine */
-/* calls during glyph loading */
-#define T1_MAX_SUBRS_CALLS 8
-
-
-/* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity */
-#define T1_MAX_CHARSTRINGS_OPERANDS 32
-
-
-/* Define T1_CONFIG_OPTION_DISABLE_HINTER if you want to generate */
-/* a driver with no hinter. This can be useful to debug the parser */
-/* */
-#undef T1_CONFIG_OPTION_DISABLE_HINTER
-
-/* Define this configuration macro if you want to prevent the */
-/* compilation of "t1afm", which is in charge of reading Type1 */
-/* AFM files into an existing face. Note that when set, the T1 */
-/* driver will be unable to produce kerning distances.. */
-/* */
-#undef T1_CONFIG_OPTION_NO_AFM
-#endif
-
-#endif /* T1CONFIG_H */
diff --git a/src/type1z/t1load.c b/src/type1z/t1load.c
index 9795031..d272e4e 100644
--- a/src/type1z/t1load.c
+++ b/src/type1z/t1load.c
@@ -59,11 +59,11 @@
*
******************************************************************/
- #include <ftdebug.h>
+#include <ftdebug.h>
+#include <ftconfig.h>
#include <t1types.h>
#include <t1errors.h>
-#include <t1config.h>
#include <t1load.h>
#include <stdio.h>
diff --git a/src/type1z/t1objs.h b/src/type1z/t1objs.h
index 417ae53..8a16863 100644
--- a/src/type1z/t1objs.h
+++ b/src/type1z/t1objs.h
@@ -19,7 +19,7 @@
#define T1OBJS_H
#include <ftobjs.h>
-#include <t1config.h>
+#include <ftconfig.h>
#include <t1errors.h>
#include <t1types.h>
diff --git a/src/type1z/t1parse.c b/src/type1z/t1parse.c
index ea86214..82b8169 100644
--- a/src/type1z/t1parse.c
+++ b/src/type1z/t1parse.c
@@ -186,6 +186,7 @@
/* This function does NOT release the heap's memory block. It is up */
/* to the caller to clean it, or reference it in its own structures. */
/* */
+#if 0
LOCAL_FUNC
void T1_Done_Table( T1_Table* table )
{
@@ -204,7 +205,7 @@
if (old_base != table->block)
shift_elements( table, old_base );
}
-
+#endif
LOCAL_FUNC
void T1_Release_Table( T1_Table* table )
diff --git a/src/type1z/t1parse.h b/src/type1z/t1parse.h
index 7a6644c..aee45f9 100644
--- a/src/type1z/t1parse.h
+++ b/src/type1z/t1parse.h
@@ -146,9 +146,10 @@
void* object,
T1_Int length );
-
+#if 0
LOCAL_DEF
void T1_Done_Table( T1_Table* table );
+#endif
LOCAL_DEF
void T1_Release_Table( T1_Table* table );