Commit 1305f2616da2a0207fa9708c77f48cc9daf88253
2002-03-28T08:07:16
* include/freetype/internal/psaux.h (PSAux_ServiceRec): Fix compiler warnings. * include/freetype/internal/t1types.h (T1_FaceRec): Use `const' for some members. * src/base/ftapi.c (FT_New_Memory_Stream): Fix typos. * src/psaux/t1cmap.c (t1_cmap_std_init, t1_cmap_unicode_init): Add cast. (t1_cmap_{standard,expert,custom,unicode}_class_rec): Use `FT_CALLBACK_TABLE_DEF'. * src/psaux/t1cmap.h: Updated. * src/sfnt/ttcmap0.c (TT_Build_CMaps): Use `ft_encoding_none' instead of zero. * src/type1/t1objs.c (T1_Face_Init): Use casts.
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 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806
diff --git a/ChangeLog b/ChangeLog
index d091263..c05b0df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,170 +1,173 @@
-2002-03-26 David Turner <david@freetype.org>
+2002-03-28 Werner Lemberg <wl@gnu.org>
+
+ * include/freetype/internal/psaux.h (PSAux_ServiceRec): Fix
+ compiler warnings.
+ * include/freetype/internal/t1types.h (T1_FaceRec): Use `const' for
+ some members.
+ * src/base/ftapi.c (FT_New_Memory_Stream): Fix typos.
+ * src/psaux/t1cmap.c (t1_cmap_std_init, t1_cmap_unicode_init): Add
+ cast.
+ (t1_cmap_{standard,expert,custom,unicode}_class_rec): Use
+ `FT_CALLBACK_TABLE_DEF'.
+ * src/psaux/t1cmap.h: Updated.
+ * src/sfnt/ttcmap0.c (TT_Build_CMaps): Use `ft_encoding_none'
+ instead of zero.
+ * src/type1/t1objs.c (T1_Face_Init): Use casts.
+
+2002-03-26 David Turner <david@freetype.org>
* src/sfnt/sfdriver.c, src/sfnt/sfobjs.c, src/sfnt/ttcmap0.c:
- fixed a small bug in the FT_CMaps support code
-
-2002-03-22 David Turner <david@freetype.org>
-
- * src/base/ftobjs.c, src/sfnt/ttcmap0.c, src/type1/t1objs.c:
-
- various fixes to make the FT_CMaps support work correctly
- (more tests are still needed)
-
- * include/freetype/internal/ftobjs.h,
- src/sfnt/Jamfile, src/sfnt/rules.mk,
- src/sfnt/sfnt.c, src/sfnt/sfobjs.c,
- src/sfnt/ttload.c, src/sfnt/ttcmap0.c, src/sfnt/ttcmap0.h:
-
- updated the SFNT charmap support to use FT_CMaps
-
-
- * include/freetype/config/ftheader.h, include/freetype/fterrors.h:
- modified "fterrors.h" to include the error definitions list found
- in "fterrdef.h"
-
- * include/freetype/internal/ftmemory.h, and a lot of other files !!:
-
- changed the names of memory macros. Examples:
-
- MEM_Set => FT_MEM_SET
- MEM_Copy => FT_MEM_COPY
- MEM_Move => FT_MEM_MOVE
-
- ALLOC => FT_ALLOC
- FREE => FT_FREE
- REALLOC = >FT_REALLOC
-
- FT_NEW was introduced to allocate a new object from a _typed_
- pointer..
-
- note that ALLOC_ARRAY and REALLOC_ARRAY have been replaced
- by FT_NEW_ARRAY and FT_RENEW_ARRAY which take _typed_ pointer
- arguments.
-
- This results in _lots_ of sources being changed, but makes the
- code more generic and less error-prone..
-
-
- * include/freetype/internal/ftstream.h,
- src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c,
- src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c,
- src/sfnt/ttpost.c, src/sfnt/ttsbit.c,
- src/truetype/ttgload.c, src/truetype/ttpload.c,
- src/winfonts/winfnt.c:
-
- changed the definitions of stream macros. Examples:
-
- NEXT_Byte => FT_NEXT_BYTE
- NEXT_Short => FT_NEXT_SHORT
- NEXT_UShortLE => FT_NEXT_USHORT_LE
- READ_Short => FT_READ_SHORT
- GET_Long => FT_GET_LONG
- etc..
-
- also introduced the FT_PEEK_XXXX functions..
-
-
-2002-03-21 David Turner <david@freetype.org>
-
- * src/base/ftobjs.c, src/pcf/pcfdriver.c, src/pcf/pcfread.c: updated
- to new FT_CMap definitions
-
- * src/psaux/t1cmap.h, src/psaux/t1cmap.c, src/type1/t1cmap.h,
- src/type1/t1cmap.c: updating and moving the Type 1 FT_CMap support
- from "src/type1" to "src/psaux" since it's going to be shared
- by the Type 1 and CID font drivers..
-
- * src/psaux/Jamfile, src/psaux/psaux.c, src/psaux/psauxmod.c,
- src/psaux/rules.mk, include/freetype/internal/psaux.h: added support
- for Type 1 FT_CMaps.
-
-2002-03-20 David Turner <david@freetype.org>
-
- * src/base/ftgloadr.c (FT_GlyphLoader_CheckSubGlyphs): fixed a memory
- allocation bug that was due to un-careful renaming of the FT_SubGlyph
- type..
-
- * src/base/ftdbgmem.c (ft_mem_table_destroy): fixed a small bug that
- caused the library to crash with Electric Fence when memory debugging
- is used..
-
- * renaming stream macros. Examples:
-
- FILE_Skip => FT_STREAM_SKIP
- FILE_Read => FT_STREAM_READ
- ACCESS_Frame => FT_FRAME_ENTER
- FORGET_Frame => FT_FRAME_EXIT
- etc...
-
- * src/sfnt/sfdriver.c (get_sfnt_postscript_name): fixed memory leak
-
- * include/freetype/internal/ftobjs.h: changing the definition of
- FT_CMap_CharNextFunc slightly
-
- * src/cff/*.c: updating CFF type definitions.
-
-2002-03-14 David Turner <david@freetype.org>
-
- * include/freetype/internal/autohint.h, src/autohint/ahmodule.c,
- src/base/ftapi.c, src/base/ftobjs.c: updating the type definitions for
- the auto-hinter module.
-
- (i.e. FT_AutoHinter_Interface => FT_AutoHinter_ServiceRec,
- FT_AutoHinter_Interface* => FT_AutoHinter_Service, etc..)
-
- * include/freetype/internal/cfftypes.h, src/cff/*.c: updating the
- type definitions of the CFF font driver
-
- (i.e. CFF_Font => CFF_FontRec
- CFF_Font* => CFF_Font, etc...)
-
- * include/freetype/internal/fnttypes.h, src/winfonts/*.c: updating
- the type definitions of the Windows FNT font driver
-
- * include/freetype/internal/ftdriver.h,
- include/freetype/internal/ftobjs.h,
- src/base/ftapi.c, src/base/ftobjs.c,
- src/cff/cffdrivr.c, src/cff/cffdrivr.h,
- src/cid/cidriver.c, src/cid/cidriver.h,
- src/pcf/pcfdriver.c, src/pcf/pcfdriver.h,
- src/truetype/ttdriver.c, src/truetype/ttdriver.h,
- src/type1/t1driver.c, src/type1/t1driver.h,
- src/winfonts/winfnt.c, src/winfonts/winfnt.h:
- updating the type definitions for font font drivers
-
- * include/freetype/internal/ftobjs.h,
- src/base/ftapi.c, src/base/ftobjs.c: updated a few face method
- definitions:
-
- FT_PSName_Requester => FT_Face_GetPostscriptNameFunc
- FT_Glyph_Name_Requester => FT_Face_GetGlyphNameFunc
- FT_Name_Index_Requester => FT_Face_GetGlyphNameIndexFunc
-
- * include/freetype/internal/psaux.h,
- src/cid/cidload.c, src/cidtoken.h,
- src/psaux/psobjs.c, src/psaux/psobjs.h, src/psaux/t1decode.c,
- stc/type1/t1load.c, src/type1/t1tokens.h: updated common Postscript
- type definitions
-
- * include/freetype/internal/psglobals.h (removed),
- include/freetype/internal/pshints.h,
- src/pshinter/pshglob.h: removing obsolete file
-
- * include/freetype/internal/tttypes.h,
- include/freetype/internal/sfnt.h,
- src/base/ftnames.c, src/cff/cffdrivr.c,
- src/sfnt/*.c, src/truetype/*.c: updated SFNT/TrueType type
- definitions
-
- * include/freetype/freetype.h, include/freetype/internal/ftgloadr.h:
- updating type defintiions for the glyph loader
-
-
-2002-03-13 Antoine Leca <antoine@oriolnet.com>
-
- * include/freetype/config/ftoption.h: changed the automatic detection
- of Microsoft C compilers to automatically support 64-bit integers only
- since revision 9.00 (i.e. >= Visual C++ 2.0)
+ Fixed a small bug in the FT_CMaps support code.
+
+2002-03-22 David Turner <david@freetype.org>
+
+ * src/base/ftobjs.c, src/sfnt/ttcmap0.c, src/type1/t1objs.c:
+ Various fixes to make the FT_CMaps support work correctly (more
+ tests are still needed).
+
+ * include/freetype/internal/ftobjs.h, src/sfnt/Jamfile,
+ src/sfnt/rules.mk, src/sfnt/sfnt.c, src/sfnt/sfobjs.c,
+ src/sfnt/ttload.c, src/sfnt/ttcmap0.c, src/sfnt/ttcmap0.h: Updated
+ the SFNT charmap support to use FT_CMaps.
+
+ * include/freetype/config/ftheader.h, include/freetype/fterrors.h:
+ Modified "fterrors.h" to include the error definitions list found in
+ "fterrdef.h".
+
+ * include/freetype/internal/ftmemory.h, and a lot of other files:
+ Changed the names of memory macros. Examples:
+
+ MEM_Set => FT_MEM_SET
+ MEM_Copy => FT_MEM_COPY
+ MEM_Move => FT_MEM_MOVE
+
+ ALLOC => FT_ALLOC
+ FREE => FT_FREE
+ REALLOC = >FT_REALLOC
+
+ FT_NEW was introduced to allocate a new object from a _typed_
+ pointer.
+
+ Note that ALLOC_ARRAY and REALLOC_ARRAY have been replaced by
+ FT_NEW_ARRAY and FT_RENEW_ARRAY which take _typed_ pointer
+ arguments.
+
+ This results in _lots_ of sources being changed, but makes the code
+ more generic and less error-prone.
+
+ * include/freetype/internal/ftstream.h, src/base/ftstream.c,
+ src/cff/cffload.c, src/pcf/pcfread.c, src/sfnt/ttcmap.c,
+ src/sfnt/ttcmap0.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
+ src/sfnt/ttsbit.c, src/truetype/ttgload.c, src/truetype/ttpload.c,
+ src/winfonts/winfnt.c: Changed the definitions of stream macros.
+ Examples:
+
+ NEXT_Byte => FT_NEXT_BYTE
+ NEXT_Short => FT_NEXT_SHORT
+ NEXT_UShortLE => FT_NEXT_USHORT_LE
+ READ_Short => FT_READ_SHORT
+ GET_Long => FT_GET_LONG
+ etc.
+
+ Also introduced the FT_PEEK_XXXX functions.
+
+2002-03-21 David Turner <david@freetype.org>
+
+ * src/base/ftobjs.c, src/pcf/pcfdriver.c, src/pcf/pcfread.c: Updated
+ to new FT_CMap definitions.
+
+ * src/psaux/t1cmap.h, src/psaux/t1cmap.c, src/type1/t1cmap.h,
+ src/type1/t1cmap.c: Updating and moving the Type 1 FT_CMap support
+ from "src/type1" to "src/psaux" since it is going to be shared by
+ the Type 1 and CID font drivers.
+
+ * src/psaux/Jamfile, src/psaux/psaux.c, src/psaux/psauxmod.c,
+ src/psaux/rules.mk, include/freetype/internal/psaux.h: Added support
+ for Type 1 FT_CMaps.
+
+2002-03-20 David Turner <david@freetype.org>
+
+ * src/base/ftgloadr.c (FT_GlyphLoader_CheckSubGlyphs): Fixed a
+ memory allocation bug that was due to un-careful renaming of the
+ FT_SubGlyph type.
+
+ * src/base/ftdbgmem.c (ft_mem_table_destroy): Fixed a small bug that
+ caused the library to crash with Electric Fence when memory
+ debugging is used.
+
+ * Renaming stream macros. Examples:
+
+ FILE_Skip => FT_STREAM_SKIP
+ FILE_Read => FT_STREAM_READ
+ ACCESS_Frame => FT_FRAME_ENTER
+ FORGET_Frame => FT_FRAME_EXIT
+ etc.
+
+ * src/sfnt/sfdriver.c (get_sfnt_postscript_name): Fixed memory leak.
+
+ * include/freetype/internal/ftobjs.h: Changing the definition of
+ FT_CMap_CharNextFunc slightly.
+
+ * src/cff/*.c: Updating CFF type definitions.
+
+2002-03-14 David Turner <david@freetype.org>
+
+ * include/freetype/internal/autohint.h, src/autohint/ahmodule.c,
+ src/base/ftapi.c, src/base/ftobjs.c: Updating the type definitions
+ for the auto-hinter module.
+
+ FT_AutoHinter_Interface => FT_AutoHinter_ServiceRec
+ FT_AutoHinter_Interface* => FT_AutoHinter_Service
+ etc.
+
+ * include/freetype/internal/cfftypes.h, src/cff/*.c: Updating the
+ type definitions of the CFF font driver.
+
+ CFF_Font => CFF_FontRec
+ CFF_Font* => CFF_Font
+ etc.
+
+ * include/freetype/internal/fnttypes.h, src/winfonts/*.c: Updating
+ type definitions of the Windows FNT font driver.
+
+ * include/freetype/internal/ftdriver.h,
+ include/freetype/internal/ftobjs.h, src/base/ftapi.c,
+ src/base/ftobjs.c, src/cff/cffdrivr.c, src/cff/cffdrivr.h,
+ src/cid/cidriver.c, src/cid/cidriver.h, src/pcf/pcfdriver.c,
+ src/pcf/pcfdriver.h, src/truetype/ttdriver.c,
+ src/truetype/ttdriver.h, src/type1/t1driver.c, src/type1/t1driver.h,
+ src/winfonts/winfnt.c, src/winfonts/winfnt.h: Updating type
+ definitions for font drivers.
+
+ * include/freetype/internal/ftobjs.h, src/base/ftapi.c,
+ src/base/ftobjs.c: Updated a few face method definitions:
+
+ FT_PSName_Requester => FT_Face_GetPostscriptNameFunc
+ FT_Glyph_Name_Requester => FT_Face_GetGlyphNameFunc
+ FT_Name_Index_Requester => FT_Face_GetGlyphNameIndexFunc
+
+ * include/freetype/internal/psaux.h, src/cid/cidload.c,
+ src/cidtoken.h, src/psaux/psobjs.c, src/psaux/psobjs.h,
+ src/psaux/t1decode.c, stc/type1/t1load.c, src/type1/t1tokens.h:
+ Updated common PostScript type definitions.
+
+ * include/freetype/internal/psglobals.h,
+ include/freetype/internal/pshints.h, src/pshinter/pshglob.h:
+ Removing obsolete files.
+
+ * include/freetype/internal/tttypes.h,
+ include/freetype/internal/sfnt.h, src/base/ftnames.c,
+ src/cff/cffdrivr.c, src/sfnt/*.c, src/truetype/*.c: Updated
+ SFNT/TrueType type definitions.
+
+ * include/freetype/freetype.h, include/freetype/internal/ftgloadr.h:
+ Updating type defintiions for the glyph loader.
+
+2002-03-13 Antoine Leca <antoine@oriolnet.com>
+
+ * include/freetype/config/ftoption.h: Changed the automatic
+ detection of Microsoft C compilers to automatically support 64-bit
+ integers only since revision 9.00 (i.e. >= Visual C++ 2.0).
2002-03-08 Werner Lemberg <wl@gnu.org>
@@ -233,18 +236,21 @@
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
-2002-03-06 David Turner <david@freetype.org>
+2002-03-06 David Turner <david@freetype.org>
- * src/type1/t1objs.c (T1_Face_Init), src/cid/cidobjs.c (CID_Face_Init):
- fixed another bug related to the ascender/descender/text height of
- Postscript fonts. Damn, this should have been fixed on 2002-03-04 !
+ * src/type1/t1objs.c (T1_Face_Init), src/cid/cidobjs.c
+ (CID_Face_Init): Fixed another bug related to the
+ ascender/descender/text height of Postscript fonts.
- * src/pshinter/pshalgo2.c: changed 'print_zone' to 'psh2_print_zone'
- * src/pshinter/pshalgo1.c: changed 'print_zone' to 'psh1_print_zone'
+ * src/pshinter/pshalgo2.c (print_zone): Renamed to ...
+ (psh2_print_zone): This.
+ * src/pshinter/pshalgo1.c (print_zone): Renamed to ...
+ (psh1_print_zone): This.
- * include/freetype/freetype.h, include/freetype/internal/ftobjs.h,
- src/base/ftobjs.c, src/base/ftinit.c: adding the new FT_Library_Version
- API to return the library's current version in dynamic links.
+ * include/freetype/freetype.h, include/freetype/internal/ftobjs.h,
+ src/base/ftobjs.c, src/base/ftinit.c: Adding the new
+ FT_Library_Version API to return the library's current version in
+ dynamic links.
2002-03-06 Werner Lemberg <wl@gnu.org>
@@ -253,18 +259,16 @@
psh_dimension_snap_width, psh_globals_destroy, psh_globals_new):
Ditto.
-2002-03-05 David Turner <david@freetype.org>
+2002-03-05 David Turner <david@freetype.org>
- * src/type1/t1objs.c (T1_Face_Init),
- src/cff/cffobjs.c (CFF_Face_Init),
- src/cid/cidobjs.c (CID_Face_Init):
-
- removing the bug that returned global BBox values in
- 16.16 fixed format (instead of integer font units).
+ * src/type1/t1objs.c (T1_Face_Init), src/cff/cffobjs.c
+ (CFF_Face_Init), src/cid/cidobjs.c (CID_Face_Init): Removing the bug
+ that returned global BBox values in 16.16 fixed format (instead of
+ integer font units).
- * src/cid/cidriver.c (cid_get_postscript_name): fixed a bug that
- caused the CID driver to return Postscript font names with a leading
- slash ("/") as in "/MOEKai-Regular"
+ * src/cid/cidriver.c (cid_get_postscript_name): Fixed a bug that
+ caused the CID driver to return Postscript font names with a leading
+ slash ("/") as in "/MOEKai-Regular".
* src/sfnt/ttload.c (TT_Load_Names), src/sfnt/sfobjs.c (Get_Name),
src/sfnt/sfdriver.c (get_sfnt_postscript_name): Fixed the loader so
@@ -275,7 +279,6 @@
Windows-encoded entries before Macintosh or Unicode ones, since it
seems some fonts don't have reliable values here anyway.
-
2002-03-05 Werner Lemberg <wl@gnu.org>
* builds/unix/aclocal.m4, builds/unix/ltmain.sh: Update to libtool
@@ -291,106 +294,93 @@
* builds/unix/configure: Regenerated.
-2002-02-28 David Turner <david@freetype.org>
-
- * include/freetype/ftconfig.h: changed FT_LOCAL xxxx to FT_LOCAL( xxxx )
- everywhere in the source. Sames goes for FT_LOCAL_DEF xxxx translated
- into FT_LOCAL_DEF( xxxxx )
-
- * include/freetype/freetype.h: changing version to 2.1.0 to indicate
- an unstable branch. Added the declarations of FT_Get_First_Char and
- FT_Get_Next_Char
-
- * src/base/ftobjs.c: implemented FT_Get_First_Char and FT_Get_Next_Char
-
- * include/freetype/t1tables.h: re-naming structure types. This done
- basically:
-
- typedef T1_Struct_
- {
- } T1_Struct;
+2002-02-28 David Turner <david@freetype.org>
- becomes:
+ * include/freetype/ftconfig.h: Changed `FT_LOCAL xxxx' to
+ `FT_LOCAL( xxxx )' everywhere in the source. The same goes for
+ `FT_LOCAL_DEF xxxx' translated to `FT_LOCAL_DEF( xxxxx )'.
- typedef PS_StructRec_
- {
- } PS_StructRec, *PS_Struct;
+ * include/freetype/freetype.h: Changing version to 2.1.0 to indicate
+ an unstable branch.
+ Added the declarations of FT_Get_First_Char and FT_Get_Next_Char.
- typedef PS_StructRec T1_Struct; /* backwards-compatibility */
+ * src/base/ftobjs.c: Implement FT_Get_First_Char and
+ FT_Get_Next_Char.
+ * include/freetype/t1tables.h: Renaming structure types. This
- hence, we increase the coherency of the source code by effectively
- using the 'Rec' prefix for structure types..
+ typedef T1_Struct_
+ {
+ } T1_Struct;
+ becomes
-2002-02-27 David Turner <david@freetype.org>
+ typedef PS_StructRec_
+ {
+ } PS_StructRec, *PS_Struct;
- * src/sfnt/ttload.c (TT_Load_Names): simplifying and securing the
- names table loader. Invalid individual name entries are now handled
- correctly. This allows the loading of very buggy fonts like
- "foxjump.ttf" without allocating tons of memory and causing crashes..
+ typedef PS_StructRec T1_Struct; /* backwards-compatibility */
- * src/otlayout/otlcommon.h, src/otlayout/otlcommon.c: adding (still
- experimental) code for OpenType Layout tables validation and parsing
+ Hence, we increase the coherency of the source code by effectively
+ using the `Rec' prefix for structure types.
- * src/type1/t1cmap.h, src/type1/t1cmap.c: adding (still experimental)
- code for Type 1 charmap processing
+2002-02-27 David Turner <david@freetype.org>
- * src/sfnt/ttcmap0.c: completing the experimental SFNT charmap
- processing
+ * src/sfnt/ttload.c (TT_Load_Names): Simplifying and securing the
+ names table loader. Invalid individual name entries are now handled
+ correctly. This allows the loading of very buggy fonts like
+ "foxjump.ttf" without allocating tons of memory and causing crashes.
- * include/freetype/internal/ftobjs.h: adding validation support as
- well as internal charmap object definitions (FT_CMap != FT_CharMap)
+ * src/otlayout/otlcommon.h, src/otlayout/otlcommon.c: Adding (still
+ experimental) code for OpenType Layout tables validation and
+ parsing.
+ * src/type1/t1cmap.h, src/type1/t1cmap.c: Adding (still
+ experimental) code for Type 1 charmap processing.
-2002-02-24 David Turner <david@freetype.org>
-
- * renaming stream functions to the FT_Subject_Action scheme:
-
- FT_Seek_Stream => FT_Stream_Seek
- FT_Skip_Stream => FT_Stream_Skip
- FT_Read_Stream => FT_Stream_Read
- FT_Read_Stream_At => FT_Stream_Read_At
- FT_Access_Frame => FT_Stream_Enter_Frame
- FT_Forget_Frame => FT_Stream_Exit_Frame
- FT_Extract_Frame => FT_Stream_Extract_Frame
- FT_Release_Frame => FT_Stream_Release_Frame
- FT_Get_XXXX => FT_Stream_Get_XXXX
- FT_Read_XXXX => FT_Stream_Read_XXXX
-
- note also that:
-
- FT_New_Stream( filename, stream ) =>
- FT_Stream_Open( stream, filename )
-
- (the function doesn't create the FT_Stream structure, it simply
- initializes it for reading)
+ * src/sfnt/ttcmap0.c: Completing the experimental SFNT charmap
+ processing.
- FT_New_Memory_Stream( library, FT_Byte* base, size, stream ) =>
- FT_Stream_Open_Memory( stream, const FT_Byte* base, size )
+ * include/freetype/internal/ftobjs.h: Adding validation support as
+ well as internal charmap object definitions (FT_CMap != FT_CharMap).
- FT_Done_Stream => FT_Stream_Close
+2002-02-24 David Turner <david@freetype.org>
- note that the name of the stream methods, defined in
- "include/freetype/ftsystem.h" have also been changed without
- problems:
+ * Renaming stream functions to the FT_<Subject>_<Action> scheme:
- FT_Stream_IO => FT_Stream_IOFunc
- FT_Stream_Close => FT_Stream_CloseFunc
+ FT_Seek_Stream => FT_Stream_Seek
+ FT_Skip_Stream => FT_Stream_Skip
+ FT_Read_Stream => FT_Stream_Read
+ FT_Read_Stream_At => FT_Stream_Read_At
+ FT_Access_Frame => FT_Stream_Enter_Frame
+ FT_Forget_Frame => FT_Stream_Exit_Frame
+ FT_Extract_Frame => FT_Stream_Extract_Frame
+ FT_Release_Frame => FT_Stream_Release_Frame
+ FT_Get_XXXX => FT_Stream_Get_XXXX
+ FT_Read_XXXX => FT_Stream_Read_XXXX
+ FT_New_Stream( filename, stream ) =>
+ FT_Stream_Open( stream, filename )
+ (The function doesn't create the FT_Stream structure, it simply
+ initializes it for reading.)
- * moving all memory and list management code to "src/base/ftutil.c"
- (previously in "ftobjs.c" and "ftlist.c" respectively)
+ FT_New_Memory_Stream( library, FT_Byte* base, size, stream ) =>
+ FT_Stream_Open_Memory( stream, const FT_Byte* base, size )
- * moving all code related to glyph loaders to "internal/ftgloadr.h"
- and "src/base/ftgloadr.c".
+ FT_Done_Stream => FT_Stream_Close
+ FT_Stream_IO => FT_Stream_IOFunc
+ FT_Stream_Close => FT_Stream_CloseFunc
- Note also that the type "FT_GlyphLoader" is now a pointer to the
- structure "FT_GlyphLoaderRec"..
+ * Moving all memory and list management code to "src/base/ftutil.c"
+ (previously in "ftobjs.c" and "ftlist.c" respectively).
+ * Moving all code related to glyph loaders to "internal/ftgloadr.h"
+ and "src/base/ftgloadr.c".
+ "FT_GlyphLoader" is now a pointer to the structure
+ "FT_GlyphLoaderRec".
- * renaming "ft_glyph_own_bitmap" into "FT_GLYPH_OWN_BITMAP"
+ * Renaming "ft_glyph_own_bitmap" into "FT_GLYPH_OWN_BITMAP".
2002-02-22 Werner Lemberg <wl@gnu.org>
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index eb3bb31..123f239 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -681,10 +681,11 @@ FT_BEGIN_HEADER
typedef struct PSAux_ServiceRec_
{
- const PS_Table_Funcs ps_table_funcs;
- const PS_Parser_Funcs ps_parser_funcs;
- const T1_Builder_Funcs t1_builder_funcs;
- const T1_Decoder_Funcs t1_decoder_funcs;
+ /* don't use `PS_Table_Funcs' and friends to avoid compiler warnings */
+ const PS_Table_FuncsRec* ps_table_funcs;
+ const PS_Parser_FuncsRec* ps_parser_funcs;
+ const T1_Builder_FuncsRec* t1_builder_funcs;
+ const T1_Decoder_FuncsRec* t1_decoder_funcs;
void
(*t1_decrypt)( FT_Byte* buffer,
diff --git a/include/freetype/internal/t1types.h b/include/freetype/internal/t1types.h
index aa6e6cb..ea5c072 100644
--- a/include/freetype/internal/t1types.h
+++ b/include/freetype/internal/t1types.h
@@ -165,18 +165,18 @@ FT_BEGIN_HEADER
{
FT_FaceRec root;
T1_FontRec type1;
- void* psnames;
- void* psaux;
- void* afm_data;
+ const void* psnames;
+ const void* psaux;
+ const void* afm_data;
FT_CharMapRec charmaprecs[2];
FT_CharMap charmaps[2];
PS_Unicodes unicode_map;
/* support for Multiple Masters fonts */
- PS_Blend blend;
+ PS_Blend blend;
/* since FT 2.1 - interface to PostScript hinter */
- void* pshinter;
+ const void* pshinter;
} T1_FaceRec;
diff --git a/src/base/ftapi.c b/src/base/ftapi.c
index 1d6654f..e97bc54 100644
--- a/src/base/ftapi.c
+++ b/src/base/ftapi.c
@@ -39,14 +39,15 @@
/* backwards compatibility API */
-
FT_BASE_DEF( void )
FT_New_Memory_Stream( FT_Library library,
FT_Byte* base,
FT_ULong size,
FT_Stream stream )
{
- return FT_Stream_OpenMemory( library, base, size, stream );
+ FT_UNUSED( library );
+
+ FT_Stream_OpenMemory( stream, base, size );
}
diff --git a/src/psaux/t1cmap.c b/src/psaux/t1cmap.c
index 94edd6d..2ec9d9e 100644
--- a/src/psaux/t1cmap.c
+++ b/src/psaux/t1cmap.c
@@ -12,11 +12,11 @@
/***************************************************************************/
static void
- t1_cmap_std_init( T1_CMapStd cmap,
- FT_Int is_expert )
+ t1_cmap_std_init( T1_CMapStd cmap,
+ FT_Int is_expert )
{
- T1_Face face = (T1_Face) FT_CMAP_FACE(cmap);
- PSNames_Service psnames = face->psnames;
+ T1_Face face = (T1_Face)FT_CMAP_FACE( cmap );
+ PSNames_Service psnames = (PSNames_Service)face->psnames;
cmap->num_glyphs = face->type1.num_glyphs;
cmap->glyph_names = (const char* const*)face->type1.glyph_names;
@@ -101,7 +101,7 @@
}
- FT_LOCAL_DEF( const FT_CMap_ClassRec )
+ FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
t1_cmap_standard_class_rec =
{
sizeof( T1_CMapStdRec ),
@@ -122,7 +122,7 @@
return 0;
}
- FT_LOCAL_DEF( const FT_CMap_ClassRec )
+ FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
t1_cmap_expert_class_rec =
{
sizeof( T1_CMapStdRec ),
@@ -215,7 +215,7 @@
}
- FT_LOCAL_DEF( const FT_CMap_ClassRec )
+ FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
t1_cmap_custom_class_rec =
{
sizeof( T1_CMapCustomRec ),
@@ -259,9 +259,10 @@
{
FT_Error error;
FT_UInt count;
- T1_Face face = (T1_Face) FT_CMAP_FACE(cmap);
- FT_Memory memory = FT_FACE_MEMORY(face);
- PSNames_Service psnames = face->psnames;
+ T1_Face face = (T1_Face)FT_CMAP_FACE( cmap );
+ FT_Memory memory = FT_FACE_MEMORY( face );
+ PSNames_Service psnames = (PSNames_Service)face->psnames;
+
cmap->num_pairs = 0;
cmap->pairs = NULL;
@@ -416,7 +417,7 @@
}
- FT_LOCAL_DEF( const FT_CMap_ClassRec )
+ FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
t1_cmap_unicode_class_rec =
{
sizeof( T1_CMapUnicodeRec ),
diff --git a/src/psaux/t1cmap.h b/src/psaux/t1cmap.h
index 6101f56..f864aef 100644
--- a/src/psaux/t1cmap.h
+++ b/src/psaux/t1cmap.h
@@ -32,9 +32,11 @@ FT_BEGIN_HEADER
} T1_CMapStdRec;
- FT_LOCAL( const FT_CMap_ClassRec ) t1_cmap_standard_class_rec;
+ FT_CALLBACK_TABLE const FT_CMap_ClassRec
+ t1_cmap_standard_class_rec;
- FT_LOCAL( const FT_CMap_ClassRec ) t1_cmap_expert_class_rec;
+ FT_CALLBACK_TABLE const FT_CMap_ClassRec
+ t1_cmap_expert_class_rec;
/***************************************************************************/
/***************************************************************************/
@@ -55,7 +57,8 @@ FT_BEGIN_HEADER
} T1_CMapCustomRec;
- FT_LOCAL( const FT_CMap_ClassRec ) t1_cmap_custom_class_rec;
+ FT_CALLBACK_TABLE const FT_CMap_ClassRec
+ t1_cmap_custom_class_rec;
/***************************************************************************/
/***************************************************************************/
@@ -85,7 +88,8 @@ FT_BEGIN_HEADER
} T1_CMapUnicodeRec;
- FT_LOCAL( const FT_CMap_ClassRec ) t1_cmap_unicode_class_rec;
+ FT_CALLBACK_TABLE const FT_CMap_ClassRec
+ t1_cmap_unicode_class_rec;
/* */
diff --git a/src/sfnt/ttcmap0.c b/src/sfnt/ttcmap0.c
index e3004e2..0cde857 100644
--- a/src/sfnt/ttcmap0.c
+++ b/src/sfnt/ttcmap0.c
@@ -1575,7 +1575,7 @@
charmap.platform_id = TT_NEXT_USHORT(p);
charmap.encoding_id = TT_NEXT_USHORT(p);
charmap.face = FT_FACE(face);
- charmap.encoding = 0; /* will be filled later */
+ charmap.encoding = ft_encoding_none; /* will be filled later */
offset = TT_NEXT_ULONG(p);
if ( offset && table + offset + 2 < limit )
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index 32346af..bb74ef4 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -277,7 +277,7 @@
FT_Int num_params,
FT_Parameter* params )
{
- FT_Error error;
+ FT_Error error;
PSNames_Service psnames;
PSAux_Service psaux;
PSHinter_Service pshinter;
@@ -290,14 +290,17 @@
face->root.num_faces = 1;
- psnames = face->psnames = (PSNames_Service)
- FT_Get_Module_Interface( FT_FACE_LIBRARY(face), "psnames" );
+ face->psnames = FT_Get_Module_Interface( FT_FACE_LIBRARY( face ),
+ "psnames" );
+ psnames = (PSNames_Service)face->psnames;
- psaux = face->psaux = (PSAux_Service)
- FT_Get_Module_Interface( FT_FACE_LIBRARY(face), "psaux" );
+ face->psaux = FT_Get_Module_Interface( FT_FACE_LIBRARY( face ),
+ "psaux" );
+ psaux = (PSAux_Service)face->psaux;
- pshinter = face->pshinter = (PSHinter_Service)
- FT_Get_Module_Interface( FT_FACE_LIBRARY(face), "pshinter" );
+ face->pshinter = FT_Get_Module_Interface( FT_FACE_LIBRARY( face ),
+ "pshinter" );
+ pshinter = (PSHinter_Service)face->pshinter;
/* open the tokenizer, this will also check the font format */
error = T1_Open_Face( face );