Commit e1d5dd78f4a75697a2584deac4af71dd21939f6a
2000-06-07T04:48:12
Moved all *errors.h header files to include/freetype/internal for consistency. Removed unused error message.
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 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074
diff --git a/include/freetype/internal/t1errors.h b/include/freetype/internal/t1errors.h
new file mode 100644
index 0000000..ce2bac4
--- /dev/null
+++ b/include/freetype/internal/t1errors.h
@@ -0,0 +1,72 @@
+/*******************************************************************
+ *
+ * t1errors.h
+ *
+ * Type1 Error ID definitions
+ *
+ * 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 T1ERRORS_H
+#define T1ERRORS_H
+
+ /************************ error codes declaration **************/
+
+ /* The error codes are grouped in 'classes' used to indicate the */
+ /* 'level' at which the error happened. */
+ /* The class is given by an error code's high byte. */
+
+
+/* ------------- Success is always 0 -------- */
+
+#define T1_Err_Ok FT_Err_Ok
+
+/* ----------- high level API errors -------- */
+
+#define T1_Err_Invalid_File_Format FT_Err_Invalid_File_Format
+#define T1_Err_Invalid_Argument FT_Err_Invalid_Argument
+#define T1_Err_Invalid_Driver_Handle FT_Err_Invalid_Driver_Handle
+#define T1_Err_Invalid_Face_Handle FT_Err_Invalid_Face_Handle
+#define T1_Err_Invalid_Size_Handle FT_Err_Invalid_Size_Handle
+#define T1_Err_Invalid_Glyph_Handle FT_Err_Invalid_Slot_Handle
+#define T1_Err_Invalid_CharMap_Handle FT_Err_Invalid_CharMap_Handle
+#define T1_Err_Invalid_Glyph_Index FT_Err_Invalid_Glyph_Index
+
+#define T1_Err_Unimplemented_Feature FT_Err_Unimplemented_Feature
+#define T1_Err_Unavailable_Outline FT_Err_Unavailable_Outline
+#define T1_Err_Unavailable_Bitmap FT_Err_Unavailable_Bitmap
+#define T1_Err_File_Is_Not_Collection FT_Err_File_Is_Not_Collection
+
+#define T1_Err_Invalid_Engine FT_Err_Invalid_Driver_Handle
+
+/* ------------- internal errors ------------ */
+
+#define T1_Err_Out_Of_Memory FT_Err_Out_Of_Memory
+#define T1_Err_Unlisted_Object FT_Err_Unlisted_Object
+
+/* ------------ general glyph outline errors ------ */
+
+#define T1_Err_Too_Many_Points FT_Err_Too_Many_Points
+#define T1_Err_Too_Many_Contours FT_Err_Too_Many_Contours
+#define T1_Err_Too_Many_Hints FT_Err_Too_Many_Hints
+#define T1_Err_Invalid_Composite FT_Err_Invalid_Composite
+#define T1_Err_Too_Many_Edges FT_Err_Too_Many_Edges
+#define T1_Err_Too_Many_Strokes FT_Err_Too_Many_Strokes
+
+
+#define T1_Err_Syntax_Error FT_Err_Invalid_File_Format
+#define T1_Err_Stack_Underflow FT_Err_Invalid_File_Format
+#define T1_Err_Stack_Overflow FT_Err_Invalid_File_Format
+
+#endif /* TDERRORS_H */
+
+
+/* END */
diff --git a/include/freetype/internal/t2errors.h b/include/freetype/internal/t2errors.h
new file mode 100644
index 0000000..ab3d4e4
--- /dev/null
+++ b/include/freetype/internal/t2errors.h
@@ -0,0 +1,126 @@
+/***************************************************************************/
+/* */
+/* t2errors.h */
+/* */
+/* OpenType error ID definitions (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. */
+/* */
+/***************************************************************************/
+
+
+#ifndef T2ERRORS_H
+#define T2ERRORS_H
+
+ /*************************************************************************/
+ /* */
+ /* Error codes declaration */
+ /* */
+ /* The error codes are grouped in `classes' used to indicate the `level' */
+ /* at which the error happened. The class is given by an error code's */
+ /* high byte. */
+ /* */
+ /*************************************************************************/
+
+
+ /* Success is always 0. */
+
+#define T2_Err_Ok FT_Err_Ok
+
+ /* High level API errors. */
+
+#define T2_Err_Invalid_File_Format FT_Err_Invalid_File_Format
+#define T2_Err_Invalid_Argument FT_Err_Invalid_Argument
+#define T2_Err_Invalid_Driver_Handle FT_Err_Invalid_Driver_Handle
+#define T2_Err_Invalid_Face_Handle FT_Err_Invalid_Face_Handle
+#define T2_Err_Invalid_Instance_Handle FT_Err_Invalid_Size_Handle
+#define T2_Err_Invalid_Glyph_Handle FT_Err_Invalid_Slot_Handle
+#define T2_Err_Invalid_CharMap_Handle FT_Err_Invalid_CharMap_Handle
+#define T2_Err_Invalid_Glyph_Index FT_Err_Invalid_Glyph_Index
+
+#define T2_Err_Unimplemented_Feature FT_Err_Unimplemented_Feature
+#define T2_Err_Unavailable_Outline FT_Err_Unavailable_Outline
+#define T2_Err_Unavailable_Bitmap FT_Err_Unavailable_Bitmap
+#define T2_Err_Unavailable_Pixmap FT_Err_Unavailable_Pixmap
+#define T2_Err_File_Is_Not_Collection FT_Err_File_Is_Not_Collection
+
+#define T2_Err_Invalid_Engine FT_Err_Invalid_Driver_Handle
+
+ /* Internal errors. */
+
+#define T2_Err_Out_Of_Memory FT_Err_Out_Of_Memory
+#define T2_Err_Unlisted_Object FT_Err_Unlisted_Object
+
+ /* General glyph outline errors. */
+
+#define T2_Err_Too_Many_Points FT_Err_Too_Many_Points
+#define T2_Err_Too_Many_Contours FT_Err_Too_Many_Contours
+#define T2_Err_Too_Many_Ins FT_Err_Too_Many_Hints
+#define T2_Err_Invalid_Composite FT_Err_Invalid_Composite
+
+ /* Bytecode interpreter error codes. */
+
+ /* These error codes are produced by the TrueType */
+ /* bytecode interpreter. They usually indicate a */
+ /* broken font file, a broken glyph within a font */
+ /* file, or a bug in the interpreter! */
+
+#define T2_Err_Invalid_Opcode 0x400
+#define T2_Err_Too_Few_Arguments 0x401
+#define T2_Err_Stack_Overflow 0x402
+#define T2_Err_Code_Overflow 0x403
+#define T2_Err_Bad_Argument 0x404
+#define T2_Err_Divide_By_Zero 0x405
+#define T2_Err_Storage_Overflow 0x406
+#define T2_Err_Cvt_Overflow 0x407
+#define T2_Err_Invalid_Reference 0x408
+#define T2_Err_Invalid_Distance 0x409
+#define T2_Err_Interpolate_Twilight 0x40A
+#define T2_Err_Debug_OpCode 0x40B
+#define T2_Err_ENDF_In_Exec_Stream 0x40C
+#define T2_Err_Out_Of_CodeRanges 0x40D
+#define T2_Err_Nested_DEFS 0x40E
+#define T2_Err_Invalid_CodeRange 0x40F
+#define T2_Err_Invalid_Displacement 0x410
+#define T2_Err_Execution_Too_Long 0x411
+
+#define T2_Err_Too_Many_Instruction_Defs 0x412
+#define T2_Err_Too_Many_Function_Defs 0x412
+
+ /* Other TrueType specific error codes. */
+
+#define T2_Err_Table_Missing 0x420
+#define T2_Err_Too_Many_Extensions 0x421
+#define T2_Err_Extensions_Unsupported 0x422
+#define T2_Err_Invalid_Extension_Id 0x423
+
+#define T2_Err_No_Vertical_Data 0x424
+
+#define T2_Err_Max_Profile_Missing 0x430
+#define T2_Err_Header_Table_Missing 0x431
+#define T2_Err_Horiz_Header_Missing 0x432
+#define T2_Err_Locations_Missing 0x433
+#define T2_Err_Name_Table_Missing 0x434
+#define T2_Err_CMap_Table_Missing 0x435
+#define T2_Err_Hmtx_Table_Missing 0x436
+#define T2_Err_OS2_Table_Missing 0x437
+#define T2_Err_Post_Table_Missing 0x438
+
+#define T2_Err_Invalid_Horiz_Metrics 0x440
+#define T2_Err_Invalid_CharMap_Format 0x441
+#define T2_Err_Invalid_PPem 0x442
+#define T2_Err_Invalid_Vert_Metrics 0x443
+
+#define T2_Err_Could_Not_Find_Context 0x450
+
+#endif /* FTERRID_H */
+
+
+/* END */
diff --git a/include/freetype/internal/tterrors.h b/include/freetype/internal/tterrors.h
index 81bcbde..4cb90d6 100644
--- a/include/freetype/internal/tterrors.h
+++ b/include/freetype/internal/tterrors.h
@@ -49,7 +49,6 @@
#define TT_Err_Unimplemented_Feature FT_Err_Unimplemented_Feature
#define TT_Err_Unavailable_Outline FT_Err_Unavailable_Outline
#define TT_Err_Unavailable_Bitmap FT_Err_Unavailable_Bitmap
-#define TT_Err_Unavailable_Pixmap FT_Err_Unavailable_Pixmap
#define TT_Err_File_Is_Not_Collection FT_Err_File_Is_Not_Collection
#define TT_Err_Invalid_Engine FT_Err_Invalid_Driver_Handle
diff --git a/src/cff/t2driver.h b/src/cff/t2driver.h
index 129096e..7aaf111 100644
--- a/src/cff/t2driver.h
+++ b/src/cff/t2driver.h
@@ -22,7 +22,7 @@
#include <freetype/internal/ftdriver.h>
#include <freetype/ttnameid.h>
#include <t2objs.h>
-#include <t2errors.h>
+#include <freetype/internal/t2errors.h>
FT_EXPORT_VAR(const FT_DriverInterface) cff_driver_interface;
diff --git a/src/cff/t2errors.h b/src/cff/t2errors.h
deleted file mode 100644
index ab3d4e4..0000000
--- a/src/cff/t2errors.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/***************************************************************************/
-/* */
-/* t2errors.h */
-/* */
-/* OpenType error ID definitions (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. */
-/* */
-/***************************************************************************/
-
-
-#ifndef T2ERRORS_H
-#define T2ERRORS_H
-
- /*************************************************************************/
- /* */
- /* Error codes declaration */
- /* */
- /* The error codes are grouped in `classes' used to indicate the `level' */
- /* at which the error happened. The class is given by an error code's */
- /* high byte. */
- /* */
- /*************************************************************************/
-
-
- /* Success is always 0. */
-
-#define T2_Err_Ok FT_Err_Ok
-
- /* High level API errors. */
-
-#define T2_Err_Invalid_File_Format FT_Err_Invalid_File_Format
-#define T2_Err_Invalid_Argument FT_Err_Invalid_Argument
-#define T2_Err_Invalid_Driver_Handle FT_Err_Invalid_Driver_Handle
-#define T2_Err_Invalid_Face_Handle FT_Err_Invalid_Face_Handle
-#define T2_Err_Invalid_Instance_Handle FT_Err_Invalid_Size_Handle
-#define T2_Err_Invalid_Glyph_Handle FT_Err_Invalid_Slot_Handle
-#define T2_Err_Invalid_CharMap_Handle FT_Err_Invalid_CharMap_Handle
-#define T2_Err_Invalid_Glyph_Index FT_Err_Invalid_Glyph_Index
-
-#define T2_Err_Unimplemented_Feature FT_Err_Unimplemented_Feature
-#define T2_Err_Unavailable_Outline FT_Err_Unavailable_Outline
-#define T2_Err_Unavailable_Bitmap FT_Err_Unavailable_Bitmap
-#define T2_Err_Unavailable_Pixmap FT_Err_Unavailable_Pixmap
-#define T2_Err_File_Is_Not_Collection FT_Err_File_Is_Not_Collection
-
-#define T2_Err_Invalid_Engine FT_Err_Invalid_Driver_Handle
-
- /* Internal errors. */
-
-#define T2_Err_Out_Of_Memory FT_Err_Out_Of_Memory
-#define T2_Err_Unlisted_Object FT_Err_Unlisted_Object
-
- /* General glyph outline errors. */
-
-#define T2_Err_Too_Many_Points FT_Err_Too_Many_Points
-#define T2_Err_Too_Many_Contours FT_Err_Too_Many_Contours
-#define T2_Err_Too_Many_Ins FT_Err_Too_Many_Hints
-#define T2_Err_Invalid_Composite FT_Err_Invalid_Composite
-
- /* Bytecode interpreter error codes. */
-
- /* These error codes are produced by the TrueType */
- /* bytecode interpreter. They usually indicate a */
- /* broken font file, a broken glyph within a font */
- /* file, or a bug in the interpreter! */
-
-#define T2_Err_Invalid_Opcode 0x400
-#define T2_Err_Too_Few_Arguments 0x401
-#define T2_Err_Stack_Overflow 0x402
-#define T2_Err_Code_Overflow 0x403
-#define T2_Err_Bad_Argument 0x404
-#define T2_Err_Divide_By_Zero 0x405
-#define T2_Err_Storage_Overflow 0x406
-#define T2_Err_Cvt_Overflow 0x407
-#define T2_Err_Invalid_Reference 0x408
-#define T2_Err_Invalid_Distance 0x409
-#define T2_Err_Interpolate_Twilight 0x40A
-#define T2_Err_Debug_OpCode 0x40B
-#define T2_Err_ENDF_In_Exec_Stream 0x40C
-#define T2_Err_Out_Of_CodeRanges 0x40D
-#define T2_Err_Nested_DEFS 0x40E
-#define T2_Err_Invalid_CodeRange 0x40F
-#define T2_Err_Invalid_Displacement 0x410
-#define T2_Err_Execution_Too_Long 0x411
-
-#define T2_Err_Too_Many_Instruction_Defs 0x412
-#define T2_Err_Too_Many_Function_Defs 0x412
-
- /* Other TrueType specific error codes. */
-
-#define T2_Err_Table_Missing 0x420
-#define T2_Err_Too_Many_Extensions 0x421
-#define T2_Err_Extensions_Unsupported 0x422
-#define T2_Err_Invalid_Extension_Id 0x423
-
-#define T2_Err_No_Vertical_Data 0x424
-
-#define T2_Err_Max_Profile_Missing 0x430
-#define T2_Err_Header_Table_Missing 0x431
-#define T2_Err_Horiz_Header_Missing 0x432
-#define T2_Err_Locations_Missing 0x433
-#define T2_Err_Name_Table_Missing 0x434
-#define T2_Err_CMap_Table_Missing 0x435
-#define T2_Err_Hmtx_Table_Missing 0x436
-#define T2_Err_OS2_Table_Missing 0x437
-#define T2_Err_Post_Table_Missing 0x438
-
-#define T2_Err_Invalid_Horiz_Metrics 0x440
-#define T2_Err_Invalid_CharMap_Format 0x441
-#define T2_Err_Invalid_PPem 0x442
-#define T2_Err_Invalid_Vert_Metrics 0x443
-
-#define T2_Err_Could_Not_Find_Context 0x450
-
-#endif /* FTERRID_H */
-
-
-/* END */
diff --git a/src/cff/t2load.c b/src/cff/t2load.c
index f98173f..bc411f0 100644
--- a/src/cff/t2load.c
+++ b/src/cff/t2load.c
@@ -25,7 +25,7 @@
#include <freetype/tttags.h>
#include <t2load.h>
#include <t2parse.h>
-#include <t2errors.h>
+#include <freetype/internal/t2errors.h>
#undef FT_COMPONENT
#define FT_COMPONENT trace_ttload
diff --git a/src/cff/t2objs.c b/src/cff/t2objs.c
index 61cc856..5a99f5f 100644
--- a/src/cff/t2objs.c
+++ b/src/cff/t2objs.c
@@ -27,7 +27,7 @@
#include <t2objs.h>
#include <t2load.h>
-#include <t2errors.h>
+#include <freetype/internal/t2errors.h>
/* required by tracing mode */
#undef FT_COMPONENT
diff --git a/src/cff/t2objs.h b/src/cff/t2objs.h
index aed60fc..73a212f 100644
--- a/src/cff/t2objs.h
+++ b/src/cff/t2objs.h
@@ -22,7 +22,7 @@
#include <freetype/internal/ftobjs.h>
#include <freetype/internal/t2types.h>
-#include <t2errors.h>
+#include <freetype/internal/t2errors.h>
#ifdef __cplusplus
diff --git a/src/cid/cidload.c b/src/cid/cidload.c
index 3ed7c62..df23e5d 100644
--- a/src/cid/cidload.c
+++ b/src/cid/cidload.c
@@ -60,7 +60,7 @@
#include <freetype/ftmm.h>
#include <freetype/internal/t1types.h>
-#include <t1errors.h>
+#include <freetype/internal/t1errors.h>
#include <cidload.h>
#include <stdio.h>
diff --git a/src/cid/cidobjs.h b/src/cid/cidobjs.h
index d31cb5a..464cd2b 100644
--- a/src/cid/cidobjs.h
+++ b/src/cid/cidobjs.h
@@ -20,7 +20,7 @@
#include <freetype/internal/ftobjs.h>
#include <freetype/config/ftconfig.h>
-#include <t1errors.h>
+#include <freetype/internal/t1errors.h>
#include <freetype/internal/t1types.h>
#ifdef __cplusplus
diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c
index 1894d15..54e8805 100644
--- a/src/cid/cidparse.c
+++ b/src/cid/cidparse.c
@@ -32,7 +32,7 @@
#include <freetype/internal/ftcalc.h>
#include <freetype/internal/ftobjs.h>
#include <freetype/internal/ftstream.h>
-#include <t1errors.h>
+#include <freetype/internal/t1errors.h>
#include <cidparse.h>
#undef FT_COMPONENT
diff --git a/src/cid/cidriver.h b/src/cid/cidriver.h
index 42c3308..25651a0 100644
--- a/src/cid/cidriver.h
+++ b/src/cid/cidriver.h
@@ -19,7 +19,7 @@
#define T1DRIVER_H
#include <cidobjs.h>
-#include <t1errors.h>
+#include <freetype/internal/t1errors.h>
FT_EXPORT_VAR(const FT_DriverInterface) t1cid_driver_interface;
diff --git a/src/cid/rules.mk b/src/cid/rules.mk
index b08481a..cdfa653 100644
--- a/src/cid/rules.mk
+++ b/src/cid/rules.mk
@@ -48,8 +48,7 @@ CID_DRV_SRC := $(CID_DIR_)cidparse.c \
# Type1 driver headers
#
-CID_DRV_H := $(CID_DIR_)t1errors.h \
- $(CID_DIR_)cidtokens.h \
+CID_DRV_H := $(CID_DIR_)cidtokens.h \
$(T1SHARED_H) \
$(CID_DRV_SRC:%.c=%.h)
diff --git a/src/cid/t1errors.h b/src/cid/t1errors.h
deleted file mode 100644
index a799115..0000000
--- a/src/cid/t1errors.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************
- *
- * t1errors.h
- *
- * Type1 Error ID definitions
- *
- * 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 T1ERRORS_H
-#define T1ERRORS_H
-
-#include <freetype/fterrors.h>
-
- /************************ error codes declaration **************/
-
- /* The error codes are grouped in 'classes' used to indicate the */
- /* 'level' at which the error happened. */
- /* The class is given by an error code's high byte. */
-
-
-/* ------------- Success is always 0 -------- */
-
-#define T1_Err_Ok FT_Err_Ok
-
-/* ----------- high level API errors -------- */
-
-#define T1_Err_Invalid_File_Format FT_Err_Invalid_File_Format
-#define T1_Err_Invalid_Argument FT_Err_Invalid_Argument
-#define T1_Err_Invalid_Driver_Handle FT_Err_Invalid_Driver_Handle
-#define T1_Err_Invalid_Face_Handle FT_Err_Invalid_Face_Handle
-#define T1_Err_Invalid_Size_Handle FT_Err_Invalid_Size_Handle
-#define T1_Err_Invalid_Glyph_Handle FT_Err_Invalid_Slot_Handle
-#define T1_Err_Invalid_CharMap_Handle FT_Err_Invalid_CharMap_Handle
-#define T1_Err_Invalid_Glyph_Index FT_Err_Invalid_Glyph_Index
-
-#define T1_Err_Unimplemented_Feature FT_Err_Unimplemented_Feature
-#define T1_Err_Unavailable_Outline FT_Err_Unavailable_Outline
-#define T1_Err_Unavailable_Bitmap FT_Err_Unavailable_Bitmap
-#define T1_Err_Unavailable_Pixmap FT_Err_Unavailable_Pixmap
-#define T1_Err_File_Is_Not_Collection FT_Err_File_Is_Not_Collection
-
-#define T1_Err_Invalid_Engine FT_Err_Invalid_Driver_Handle
-
-/* ------------- internal errors ------------ */
-
-#define T1_Err_Out_Of_Memory FT_Err_Out_Of_Memory
-#define T1_Err_Unlisted_Object FT_Err_Unlisted_Object
-
-/* ------------ general glyph outline errors ------ */
-
-#define T1_Err_Too_Many_Points FT_Err_Too_Many_Points
-#define T1_Err_Too_Many_Contours FT_Err_Too_Many_Contours
-#define T1_Err_Too_Many_Hints FT_Err_Too_Many_Hints
-#define T1_Err_Invalid_Composite FT_Err_Invalid_Composite
-#define T1_Err_Too_Many_Edges FT_Err_Too_Many_Edges
-#define T1_Err_Too_Many_Strokes FT_Err_Too_Many_Strokes
-
-
-#define T1_Err_Syntax_Error FT_Err_Invalid_File_Format
-#define T1_Err_Stack_Underflow FT_Err_Invalid_File_Format
-#define T1_Err_Stack_Overflow FT_Err_Invalid_File_Format
-
-#endif /* TDERRORS_H */
-
-
-/* END */
diff --git a/src/sfnt/rules.mk b/src/sfnt/rules.mk
index 395aab1..a059b9c 100644
--- a/src/sfnt/rules.mk
+++ b/src/sfnt/rules.mk
@@ -6,7 +6,7 @@
# 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
+# 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
diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c
index efb5831..7b770c1 100644
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -858,7 +858,7 @@
if ( range->index_format == 2 || range->index_format == 5 )
*metrics = range->metrics;
else
- return FT_Err_Invalid_File_Format;
+ return TT_Err_Invalid_File_Format;
}
Exit:
diff --git a/src/truetype/rules.mk b/src/truetype/rules.mk
index bfb1f5e..a12ef03 100644
--- a/src/truetype/rules.mk
+++ b/src/truetype/rules.mk
@@ -1,5 +1,5 @@
#
-# FreeType 2 PSNames driver configuration rules
+# FreeType 2 TrueType driver configuration rules
#
@@ -13,7 +13,7 @@
# fully.
-# Include the rules defined for the SFNT driver, which is heavily used
+# Include the rules defined for the SFNT driver, which are heavily used
# by the TrueType one.
#
include $(SRC_)sfnt/rules.mk
@@ -97,7 +97,6 @@ $(TT_DRV_OBJ_S): $(BASE_H) $(TT_DRV_H) $(TT_DRV_SRC) $(TT_DRV_SRC_S)
$(TT_COMPILE) $T$@ $(TT_DRV_SRC_S)
-
# driver - multiple objects
#
# All objects are recompiled if any of the header files is changed
diff --git a/src/truetype/ttdriver.h b/src/truetype/ttdriver.h
index 9970124..faa0015 100644
--- a/src/truetype/ttdriver.h
+++ b/src/truetype/ttdriver.h
@@ -22,7 +22,7 @@
#include <freetype/internal/ftdriver.h>
#include <freetype/ttnameid.h>
#include <ttobjs.h>
-#include <tterrors.h>
+#include <freetype/internal/tterrors.h>
FT_EXPORT_VAR(const FT_DriverInterface) tt_driver_interface;
diff --git a/src/truetype/tterrors.h b/src/truetype/tterrors.h
deleted file mode 100644
index c8b272c..0000000
--- a/src/truetype/tterrors.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/***************************************************************************/
-/* */
-/* tterrors.h */
-/* */
-/* TrueType error ID definitions (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. */
-/* */
-/***************************************************************************/
-
-
-#ifndef TTERRORS_H
-#define TTERRORS_H
-
- /*************************************************************************/
- /* */
- /* Error codes declaration */
- /* */
- /* The error codes are grouped in `classes' used to indicate the `level' */
- /* at which the error happened. The class is given by an error code's */
- /* high byte. */
- /* */
- /*************************************************************************/
-
-
- /* Success is always 0. */
-
-#define TT_Err_Ok FT_Err_Ok
-
- /* High level API errors. */
-
-#define TT_Err_Invalid_File_Format FT_Err_Invalid_File_Format
-#define TT_Err_Invalid_Argument FT_Err_Invalid_Argument
-#define TT_Err_Invalid_Driver_Handle FT_Err_Invalid_Driver_Handle
-#define TT_Err_Invalid_Face_Handle FT_Err_Invalid_Face_Handle
-#define TT_Err_Invalid_Instance_Handle FT_Err_Invalid_Size_Handle
-#define TT_Err_Invalid_Glyph_Handle FT_Err_Invalid_Slot_Handle
-#define TT_Err_Invalid_CharMap_Handle FT_Err_Invalid_CharMap_Handle
-#define TT_Err_Invalid_Glyph_Index FT_Err_Invalid_Glyph_Index
-
-#define TT_Err_Unimplemented_Feature FT_Err_Unimplemented_Feature
-#define TT_Err_Unavailable_Outline FT_Err_Unavailable_Outline
-#define TT_Err_Unavailable_Bitmap FT_Err_Unavailable_Bitmap
-#define TT_Err_Unavailable_Pixmap FT_Err_Unavailable_Pixmap
-#define TT_Err_File_Is_Not_Collection FT_Err_File_Is_Not_Collection
-
-#define TT_Err_Invalid_Engine FT_Err_Invalid_Driver_Handle
-
- /* Internal errors. */
-
-#define TT_Err_Out_Of_Memory FT_Err_Out_Of_Memory
-#define TT_Err_Unlisted_Object FT_Err_Unlisted_Object
-
- /* General glyph outline errors. */
-
-#define TT_Err_Too_Many_Points FT_Err_Too_Many_Points
-#define TT_Err_Too_Many_Contours FT_Err_Too_Many_Contours
-#define TT_Err_Too_Many_Ins FT_Err_Too_Many_Hints
-#define TT_Err_Invalid_Composite FT_Err_Invalid_Composite
-
- /* Bytecode interpreter error codes. */
-
- /* These error codes are produced by the TrueType */
- /* bytecode interpreter. They usually indicate a */
- /* broken font file, a broken glyph within a font */
- /* file, or a bug in the interpreter! */
-
-#define TT_Err_Invalid_Opcode 0x400
-#define TT_Err_Too_Few_Arguments 0x401
-#define TT_Err_Stack_Overflow 0x402
-#define TT_Err_Code_Overflow 0x403
-#define TT_Err_Bad_Argument 0x404
-#define TT_Err_Divide_By_Zero 0x405
-#define TT_Err_Storage_Overflow 0x406
-#define TT_Err_Cvt_Overflow 0x407
-#define TT_Err_Invalid_Reference 0x408
-#define TT_Err_Invalid_Distance 0x409
-#define TT_Err_Interpolate_Twilight 0x40A
-#define TT_Err_Debug_OpCode 0x40B
-#define TT_Err_ENDF_In_Exec_Stream 0x40C
-#define TT_Err_Out_Of_CodeRanges 0x40D
-#define TT_Err_Nested_DEFS 0x40E
-#define TT_Err_Invalid_CodeRange 0x40F
-#define TT_Err_Invalid_Displacement 0x410
-#define TT_Err_Execution_Too_Long 0x411
-
-#define TT_Err_Too_Many_Instruction_Defs 0x412
-#define TT_Err_Too_Many_Function_Defs 0x412
-
- /* Other TrueType specific error codes. */
-
-#define TT_Err_Table_Missing 0x420
-#define TT_Err_Too_Many_Extensions 0x421
-#define TT_Err_Extensions_Unsupported 0x422
-#define TT_Err_Invalid_Extension_Id 0x423
-
-#define TT_Err_No_Vertical_Data 0x424
-
-#define TT_Err_Max_Profile_Missing 0x430
-#define TT_Err_Header_Table_Missing 0x431
-#define TT_Err_Horiz_Header_Missing 0x432
-#define TT_Err_Locations_Missing 0x433
-#define TT_Err_Name_Table_Missing 0x434
-#define TT_Err_CMap_Table_Missing 0x435
-#define TT_Err_Hmtx_Table_Missing 0x436
-#define TT_Err_OS2_Table_Missing 0x437
-#define TT_Err_Post_Table_Missing 0x438
-
-#define TT_Err_Invalid_Horiz_Metrics 0x440
-#define TT_Err_Invalid_CharMap_Format 0x441
-#define TT_Err_Invalid_PPem 0x442
-#define TT_Err_Invalid_Vert_Metrics 0x443
-
-#define TT_Err_Could_Not_Find_Context 0x450
-
-#endif /* FTERRID_H */
-
-
-/* END */
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index ce8b3aa..9e53b5d 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -21,7 +21,7 @@
#include <freetype/ftsystem.h>
#include <ttobjs.h>
-#include <tterrors.h>
+#include <freetype/internal/tterrors.h>
#include <ttinterp.h>
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index a3b97c0..e05cb53 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -27,7 +27,7 @@
#include <ttobjs.h>
#include <ttpload.h>
-#include <tterrors.h>
+#include <freetype/internal/tterrors.h>
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
#include <ttinterp.h>
diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h
index 3bace38..220e706 100644
--- a/src/truetype/ttobjs.h
+++ b/src/truetype/ttobjs.h
@@ -22,7 +22,7 @@
#include <freetype/internal/ftobjs.h>
#include <freetype/internal/tttypes.h>
-#include <tterrors.h>
+#include <freetype/internal/tterrors.h>
#ifdef __cplusplus
diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c
index e0fe0f5..e2b4e48 100644
--- a/src/truetype/ttpload.c
+++ b/src/truetype/ttpload.c
@@ -22,7 +22,7 @@
#include <freetype/tttags.h>
#include <ttpload.h>
-#include <tterrors.h>
+#include <freetype/internal/tterrors.h>
#undef FT_COMPONENT
#define FT_COMPONENT trace_ttload
diff --git a/src/type1/rules.mk b/src/type1/rules.mk
index 3680523..d35997c 100644
--- a/src/type1/rules.mk
+++ b/src/type1/rules.mk
@@ -108,8 +108,7 @@ T1_DRV_SRC := $(T1_DIR_)t1objs.c \
# Type1 driver headers
#
-T1_DRV_H := $(T1_DIR_)t1errors.h \
- $(T1SHARED_H) \
+T1_DRV_H := $(T1SHARED_H) \
$(T1_DRV_SRC:%.c=%.h)
diff --git a/src/type1/t1driver.h b/src/type1/t1driver.h
index 2cad9bf..5cd362b 100644
--- a/src/type1/t1driver.h
+++ b/src/type1/t1driver.h
@@ -19,7 +19,7 @@
#define T1DRIVER_H
#include <t1objs.h>
-#include <t1errors.h>
+#include <freetype/internal/t1errors.h>
FT_EXPORT_VAR(const FT_DriverInterface) t1_driver_interface;
diff --git a/src/type1/t1errors.h b/src/type1/t1errors.h
deleted file mode 100644
index 7984f54..0000000
--- a/src/type1/t1errors.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************
- *
- * t1errors.h
- *
- * Type1 Error ID definitions
- *
- * 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 FREETYPE_H
-#error "Don't include this file! Use t1driver.h instead."
-#endif
-
-#ifndef T1ERRORS_H
-#define T1ERRORS_H
-
- /************************ error codes declaration **************/
-
- /* The error codes are grouped in 'classes' used to indicate the */
- /* 'level' at which the error happened. */
- /* The class is given by an error code's high byte. */
-
-
-/* ------------- Success is always 0 -------- */
-
-#define T1_Err_Ok FT_Err_Ok
-
-/* ----------- high level API errors -------- */
-
-#define T1_Err_Invalid_File_Format FT_Err_Invalid_File_Format
-#define T1_Err_Invalid_Argument FT_Err_Invalid_Argument
-#define T1_Err_Invalid_Driver_Handle FT_Err_Invalid_Driver_Handle
-#define T1_Err_Invalid_Face_Handle FT_Err_Invalid_Face_Handle
-#define T1_Err_Invalid_Size_Handle FT_Err_Invalid_Size_Handle
-#define T1_Err_Invalid_Glyph_Handle FT_Err_Invalid_Slot_Handle
-#define T1_Err_Invalid_CharMap_Handle FT_Err_Invalid_CharMap_Handle
-#define T1_Err_Invalid_Glyph_Index FT_Err_Invalid_Glyph_Index
-
-#define T1_Err_Unimplemented_Feature FT_Err_Unimplemented_Feature
-#define T1_Err_Unavailable_Outline FT_Err_Unavailable_Outline
-#define T1_Err_Unavailable_Bitmap FT_Err_Unavailable_Bitmap
-#define T1_Err_Unavailable_Pixmap FT_Err_Unavailable_Pixmap
-#define T1_Err_File_Is_Not_Collection FT_Err_File_Is_Not_Collection
-
-#define T1_Err_Invalid_Engine FT_Err_Invalid_Driver_Handle
-
-/* ------------- internal errors ------------ */
-
-#define T1_Err_Out_Of_Memory FT_Err_Out_Of_Memory
-#define T1_Err_Unlisted_Object FT_Err_Unlisted_Object
-
-/* ------------ general glyph outline errors ------ */
-
-#define T1_Err_Too_Many_Points FT_Err_Too_Many_Points
-#define T1_Err_Too_Many_Contours FT_Err_Too_Many_Contours
-#define T1_Err_Too_Many_Hints FT_Err_Too_Many_Hints
-#define T1_Err_Invalid_Composite FT_Err_Invalid_Composite
-#define T1_Err_Too_Many_Edges FT_Err_Too_Many_Edges
-#define T1_Err_Too_Many_Strokes FT_Err_Too_Many_Strokes
-
-
-#define T1_Err_Syntax_Error FT_Err_Invalid_File_Format
-#define T1_Err_Stack_Underflow FT_Err_Invalid_File_Format
-#define T1_Err_Stack_Overflow FT_Err_Invalid_File_Format
-
-#endif /* TDERRORS_H */
-
-
-/* END */
diff --git a/src/type1/t1objs.h b/src/type1/t1objs.h
index dd4220f..48c7ce1 100644
--- a/src/type1/t1objs.h
+++ b/src/type1/t1objs.h
@@ -22,7 +22,7 @@
#include <freetype/internal/ftobjs.h>
#include <freetype/internal/t1types.h>
-#include <t1errors.h>
+#include <freetype/internal/t1errors.h>
#ifdef __cplusplus
extern "C" {
diff --git a/src/type1z/rules.mk b/src/type1z/rules.mk
index 93d6072..07903ca 100644
--- a/src/type1z/rules.mk
+++ b/src/type1z/rules.mk
@@ -48,8 +48,7 @@ T1Z_DRV_SRC := $(T1Z_DIR_)t1parse.c \
# Type1 driver headers
#
-T1Z_DRV_H := $(T1Z_DIR_)t1errors.h \
- $(T1SHARED_H) \
+T1Z_DRV_H := $(T1SHARED_H) \
$(T1Z_DRV_SRC:%.c=%.h)
diff --git a/src/type1z/t1driver.h b/src/type1z/t1driver.h
index a998070..08d7a35 100644
--- a/src/type1z/t1driver.h
+++ b/src/type1z/t1driver.h
@@ -19,7 +19,7 @@
#define T1DRIVER_H
#include <t1objs.h>
-#include <t1errors.h>
+#include <freetype/internal/t1errors.h>
FT_EXPORT_VAR(const FT_DriverInterface) t1z_driver_interface;
diff --git a/src/type1z/t1errors.h b/src/type1z/t1errors.h
deleted file mode 100644
index a799115..0000000
--- a/src/type1z/t1errors.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************
- *
- * t1errors.h
- *
- * Type1 Error ID definitions
- *
- * 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 T1ERRORS_H
-#define T1ERRORS_H
-
-#include <freetype/fterrors.h>
-
- /************************ error codes declaration **************/
-
- /* The error codes are grouped in 'classes' used to indicate the */
- /* 'level' at which the error happened. */
- /* The class is given by an error code's high byte. */
-
-
-/* ------------- Success is always 0 -------- */
-
-#define T1_Err_Ok FT_Err_Ok
-
-/* ----------- high level API errors -------- */
-
-#define T1_Err_Invalid_File_Format FT_Err_Invalid_File_Format
-#define T1_Err_Invalid_Argument FT_Err_Invalid_Argument
-#define T1_Err_Invalid_Driver_Handle FT_Err_Invalid_Driver_Handle
-#define T1_Err_Invalid_Face_Handle FT_Err_Invalid_Face_Handle
-#define T1_Err_Invalid_Size_Handle FT_Err_Invalid_Size_Handle
-#define T1_Err_Invalid_Glyph_Handle FT_Err_Invalid_Slot_Handle
-#define T1_Err_Invalid_CharMap_Handle FT_Err_Invalid_CharMap_Handle
-#define T1_Err_Invalid_Glyph_Index FT_Err_Invalid_Glyph_Index
-
-#define T1_Err_Unimplemented_Feature FT_Err_Unimplemented_Feature
-#define T1_Err_Unavailable_Outline FT_Err_Unavailable_Outline
-#define T1_Err_Unavailable_Bitmap FT_Err_Unavailable_Bitmap
-#define T1_Err_Unavailable_Pixmap FT_Err_Unavailable_Pixmap
-#define T1_Err_File_Is_Not_Collection FT_Err_File_Is_Not_Collection
-
-#define T1_Err_Invalid_Engine FT_Err_Invalid_Driver_Handle
-
-/* ------------- internal errors ------------ */
-
-#define T1_Err_Out_Of_Memory FT_Err_Out_Of_Memory
-#define T1_Err_Unlisted_Object FT_Err_Unlisted_Object
-
-/* ------------ general glyph outline errors ------ */
-
-#define T1_Err_Too_Many_Points FT_Err_Too_Many_Points
-#define T1_Err_Too_Many_Contours FT_Err_Too_Many_Contours
-#define T1_Err_Too_Many_Hints FT_Err_Too_Many_Hints
-#define T1_Err_Invalid_Composite FT_Err_Invalid_Composite
-#define T1_Err_Too_Many_Edges FT_Err_Too_Many_Edges
-#define T1_Err_Too_Many_Strokes FT_Err_Too_Many_Strokes
-
-
-#define T1_Err_Syntax_Error FT_Err_Invalid_File_Format
-#define T1_Err_Stack_Underflow FT_Err_Invalid_File_Format
-#define T1_Err_Stack_Overflow FT_Err_Invalid_File_Format
-
-#endif /* TDERRORS_H */
-
-
-/* END */
diff --git a/src/type1z/t1load.c b/src/type1z/t1load.c
index f1de8dc..3adbc31 100644
--- a/src/type1z/t1load.c
+++ b/src/type1z/t1load.c
@@ -64,7 +64,7 @@
#include <freetype/ftmm.h>
#include <freetype/internal/t1types.h>
-#include <t1errors.h>
+#include <freetype/internal/t1errors.h>
#include <t1load.h>
#include <stdio.h>
diff --git a/src/type1z/t1objs.h b/src/type1z/t1objs.h
index 7da6713..0b1af90 100644
--- a/src/type1z/t1objs.h
+++ b/src/type1z/t1objs.h
@@ -20,7 +20,7 @@
#include <freetype/internal/ftobjs.h>
#include <freetype/config/ftconfig.h>
-#include <t1errors.h>
+#include <freetype/internal/t1errors.h>
#include <freetype/internal/t1types.h>
#ifdef __cplusplus
diff --git a/src/type1z/t1parse.c b/src/type1z/t1parse.c
index 2758106..c2fc52c 100644
--- a/src/type1z/t1parse.c
+++ b/src/type1z/t1parse.c
@@ -32,7 +32,7 @@
#include <freetype/internal/ftcalc.h>
#include <freetype/internal/ftobjs.h>
#include <freetype/internal/ftstream.h>
-#include <t1errors.h>
+#include <freetype/internal/t1errors.h>
#include <t1parse.h>
#undef FT_COMPONENT