Commit dc72aff43d036b7f3fb3a448eece15c95353b4e6
2000-11-04T08:33:38
Finishing David's latest changes (there were some errors in it).
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 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380
diff --git a/builds/cygwin/devel/freetype/config/ftoption.h b/builds/cygwin/devel/freetype/config/ftoption.h
index 131d365..644c143 100644
--- a/builds/cygwin/devel/freetype/config/ftoption.h
+++ b/builds/cygwin/devel/freetype/config/ftoption.h
@@ -155,29 +155,29 @@
/* declarations. */
/* */
/* Two macros are used within the FreeType source code to define */
- /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */
+ /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */
/* */
- /* FT_EXPORT( return_type ) */
+ /* FT_EXPORT( return_type ) */
/* */
/* is used in a function declaration, as in */
/* */
- /* FT_EXPORT( FT_Error ) */
+ /* FT_EXPORT( FT_Error ) */
/* FT_Init_FreeType( FT_Library* alibrary ); */
/* */
/* */
- /* FT_EXPORT_DEF( return_type ) */
+ /* FT_EXPORT_DEF( return_type ) */
/* */
/* is used in a function definition, as in */
/* */
- /* FT_EXPORT_DEF( FT_Error ) */
+ /* FT_EXPORT_DEF( FT_Error ) */
/* FT_Init_FreeType( FT_Library* alibrary ) */
/* { */
/* ... some code ... */
/* return FT_Err_Ok; */
/* } */
/* */
- /* You can provide your own implementation of FT_EXPORT and */
- /* FT_EXPORT_DEF here if you want. If you leave them undefined, they */
+ /* You can provide your own implementation of FT_EXPORT and */
+ /* FT_EXPORT_DEF here if you want. If you leave them undefined, they */
/* will be later automatically defined as `extern return_type' to */
/* allow normal compilation. */
/* */
diff --git a/builds/cygwin/ftsystem.c b/builds/cygwin/ftsystem.c
index 7e7f52b..f365c95 100644
--- a/builds/cygwin/ftsystem.c
+++ b/builds/cygwin/ftsystem.c
@@ -219,7 +219,7 @@
/* FreeType error code. 0 means success. */
/* */
FT_EXPORT_DEF( FT_Error ) FT_New_Stream( const char* filepathname,
- FT_Stream stream )
+ FT_Stream stream )
{
int file;
struct stat stat_buf;
diff --git a/builds/dos/dos-gcc.mk b/builds/dos/dos-gcc.mk
index 7670078..50bfa3b 100644
--- a/builds/dos/dos-gcc.mk
+++ b/builds/dos/dos-gcc.mk
@@ -15,8 +15,8 @@
SEP := /
CLEAN_LIBRARY := $(DELETE) $@
+
include $(TOP)/builds/compiler/gcc.mk
include $(TOP)/builds/dos/dos-def.mk
# EOF
-
diff --git a/builds/unix/devel/freetype/config/ftoption.h b/builds/unix/devel/freetype/config/ftoption.h
index 131d365..644c143 100644
--- a/builds/unix/devel/freetype/config/ftoption.h
+++ b/builds/unix/devel/freetype/config/ftoption.h
@@ -155,29 +155,29 @@
/* declarations. */
/* */
/* Two macros are used within the FreeType source code to define */
- /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */
+ /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */
/* */
- /* FT_EXPORT( return_type ) */
+ /* FT_EXPORT( return_type ) */
/* */
/* is used in a function declaration, as in */
/* */
- /* FT_EXPORT( FT_Error ) */
+ /* FT_EXPORT( FT_Error ) */
/* FT_Init_FreeType( FT_Library* alibrary ); */
/* */
/* */
- /* FT_EXPORT_DEF( return_type ) */
+ /* FT_EXPORT_DEF( return_type ) */
/* */
/* is used in a function definition, as in */
/* */
- /* FT_EXPORT_DEF( FT_Error ) */
+ /* FT_EXPORT_DEF( FT_Error ) */
/* FT_Init_FreeType( FT_Library* alibrary ) */
/* { */
/* ... some code ... */
/* return FT_Err_Ok; */
/* } */
/* */
- /* You can provide your own implementation of FT_EXPORT and */
- /* FT_EXPORT_DEF here if you want. If you leave them undefined, they */
+ /* You can provide your own implementation of FT_EXPORT and */
+ /* FT_EXPORT_DEF here if you want. If you leave them undefined, they */
/* will be later automatically defined as `extern return_type' to */
/* allow normal compilation. */
/* */
diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in
index e9c567f..e5c5087 100644
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@@ -145,64 +145,64 @@
#ifdef FT_MAKE_OPTION_SINGLE_OBJECT
-#define LOCAL_DEF static
-#define LOCAL_FUNC static
+#define FT_LOCAL static
+#define FT_LOCAL_DEF static
#else
#ifdef __cplusplus
-#define LOCAL_DEF extern "C"
-#define LOCAL_FUNC extern "C"
+#define FT_LOCAL extern "C"
+#define FT_LOCAL_DEF extern "C"
#else
-#define LOCAL_DEF extern
-#define LOCAL_FUNC extern
+#define FT_LOCAL extern
+#define FT_LOCAL_DEF extern
#endif
#endif /* FT_MAKE_OPTION_SINGLE_OBJECT */
-#ifndef BASE_DEF
+#ifndef FT_BASE
#ifdef __cplusplus
-#define BASE_DEF( x ) extern "C" x
+#define FT_BASE( x ) extern "C" x
#else
-#define BASE_DEF( x ) extern x
+#define FT_BASE( x ) extern x
#endif
-#endif /* !BASE_DEF */
+#endif /* !FT_BASE */
-#ifndef BASE_FUNC
+#ifndef FT_BASE_DEF
#ifdef __cplusplus
-#define BASE_FUNC( x ) extern "C" x
+#define FT_BASE_DEF( x ) extern "C" x
#else
-#define BASE_FUNC( x ) extern x
+#define FT_BASE_DEF( x ) extern x
#endif
-#endif /* !BASE_FUNC */
+#endif /* !FT_BASE_DEF */
-#ifndef FT_EXPORT_DEF
+#ifndef FT_EXPORT
#ifdef __cplusplus
-#define FT_EXPORT_DEF( x ) extern "C" x
+#define FT_EXPORT( x ) extern "C" x
#else
-#define FT_EXPORT_DEF( x ) extern x
+#define FT_EXPORT( x ) extern x
#endif
-#endif /* !FT_EXPORT_DEF */
+#endif /* !FT_EXPORT */
-#ifndef FT_EXPORT_FUNC
+#ifndef FT_EXPORT_DEF
#ifdef __cplusplus
-#define FT_EXPORT_FUNC( x ) extern "C" x
+#define FT_EXPORT_DEF( x ) extern "C" x
#else
-#define FT_EXPORT_FUNC( x ) extern x
+#define FT_EXPORT_DEF( x ) extern x
#endif
-#endif /* !FT_EXPORT_FUNC */
+#endif /* !FT_EXPORT_DEF */
#ifndef FT_EXPORT_VAR
@@ -215,6 +215,10 @@
#endif /* !FT_EXPORT_VAR */
+ /* The following macros are needed to compile the library with a */
+ /* C++ compiler. Note that we do this for convenience -- please */
+ /* don't ask for more C++ features. */
+ /* */
/* This is special. Within C++, you must specify `extern "C"' for */
/* functions which are used via function pointers, and you also */
@@ -222,21 +226,26 @@
/* assure C linkage -- it's not possible to have (local) anonymous */
/* functions which are accessed by (global) function pointers. */
/* */
+ /* */
+ /* FT_CALLBACK_DEF is used to _define_ a callback function. */
+ /* */
+ /* FT_CALLBACK_TABLE is used to _declare_ a constant variable that */
+ /* contains pointers to callback functions. */
+ /* */
+ /* FT_CALLBACK_TABLE_DEF is used to _define_ a constant variable */
+ /* that contains pointers to callback functions. */
+ /* */
#ifdef __cplusplus
-#define LOCAL_VAR extern "C"
-
-#define LOCAL_FUNC_X extern "C"
-
-#define FT_CPLUSPLUS( x ) extern "C" x
+#define FT_CALLBACK_DEF extern "C"
+#define FT_CALLBACK_TABLE extern "C"
+#define FT_CALLBACK_TABLE_DEF extern "C"
#else
-#define LOCAL_VAR extern
-
-#define LOCAL_FUNC_X static
-
-#define FT_CPLUSPLUS( x ) x
+#define FT_CALLBACK_DEF static
+#define FT_CALLBACK_TABLE extern
+#define FT_CALLBACK_TABLE_DEF
#endif /* __cplusplus */
diff --git a/builds/unix/ftsystem.c b/builds/unix/ftsystem.c
index 7e7f52b..f365c95 100644
--- a/builds/unix/ftsystem.c
+++ b/builds/unix/ftsystem.c
@@ -219,7 +219,7 @@
/* FreeType error code. 0 means success. */
/* */
FT_EXPORT_DEF( FT_Error ) FT_New_Stream( const char* filepathname,
- FT_Stream stream )
+ FT_Stream stream )
{
int file;
struct stat stat_buf;
diff --git a/builds/win32/devel/freetype/config/ftoption.h b/builds/win32/devel/freetype/config/ftoption.h
index c90db5b..8a967ae 100644
--- a/builds/win32/devel/freetype/config/ftoption.h
+++ b/builds/win32/devel/freetype/config/ftoption.h
@@ -155,29 +155,29 @@
/* declarations. */
/* */
/* Two macros are used within the FreeType source code to define */
- /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */
+ /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */
/* */
- /* FT_EXPORT( return_type ) */
+ /* FT_EXPORT( return_type ) */
/* */
/* is used in a function declaration, as in */
/* */
- /* FT_EXPORT( FT_Error ) */
+ /* FT_EXPORT( FT_Error ) */
/* FT_Init_FreeType( FT_Library* alibrary ); */
/* */
/* */
- /* FT_EXPORT_DEF( return_type ) */
+ /* FT_EXPORT_DEF( return_type ) */
/* */
/* is used in a function definition, as in */
/* */
- /* FT_EXPORT_DEF( FT_Error ) */
+ /* FT_EXPORT_DEF( FT_Error ) */
/* FT_Init_FreeType( FT_Library* alibrary ) */
/* { */
/* ... some code ... */
/* return FT_Err_Ok; */
/* } */
/* */
- /* You can provide your own implementation of FT_EXPORT and */
- /* FT_EXPORT_DEF here if you want. If you leave them undefined, they */
+ /* You can provide your own implementation of FT_EXPORT and */
+ /* FT_EXPORT_DEF here if you want. If you leave them undefined, they */
/* will be later automatically defined as `extern return_type' to */
/* allow normal compilation. */
/* */
diff --git a/include/freetype/cache/ftcglyph.h b/include/freetype/cache/ftcglyph.h
index 1116006..6e2383e 100644
--- a/include/freetype/cache/ftcglyph.h
+++ b/include/freetype/cache/ftcglyph.h
@@ -169,8 +169,8 @@
/* */
FT_EXPORT_DEF( void ) FTC_GlyphNode_Init( FTC_GlyphNode node,
- FTC_GlyphSet gset,
- FT_UInt gindex );
+ FTC_GlyphSet gset,
+ FT_UInt gindex );
#define FTC_GlyphNode_Ref( n ) \
FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count++
@@ -192,9 +192,9 @@
FTC_GlyphSet* aset );
FT_EXPORT( FT_Error ) FTC_GlyphSet_Lookup_Node(
- FTC_GlyphSet gset,
- FT_UInt glyph_index,
- FTC_GlyphNode* anode );
+ FTC_GlyphSet gset,
+ FT_UInt glyph_index,
+ FTC_GlyphNode* anode );
#ifdef __cplusplus
diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h
index 9fe7f5d..71a081a 100644
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@@ -229,9 +229,9 @@
#endif /* !FT_EXPORT_VAR */
- /* the following macros are needed to compile the library with a */
- /* C++ compiler. Werner insisted on being able to do that even */
- /* though we explicitely do not support C++ compilation */
+ /* The following macros are needed to compile the library with a */
+ /* C++ compiler. Note that we do this for convenience -- please */
+ /* don't ask for more C++ features. */
/* */
/* This is special. Within C++, you must specify `extern "C"' for */
@@ -241,13 +241,13 @@
/* functions which are accessed by (global) function pointers. */
/* */
/* */
- /* FT_CALLBACK_DEF is used to _define_ a callback function */
+ /* FT_CALLBACK_DEF is used to _define_ a callback function. */
/* */
- /* FT_CALLBACK_TABLE is used to _declare_ a constant variable */
- /* that contains pointers to callback functions */
+ /* FT_CALLBACK_TABLE is used to _declare_ a constant variable that */
+ /* contains pointers to callback functions. */
/* */
/* FT_CALLBACK_TABLE_DEF is used to _define_ a constant variable */
- /* that contains pointers to callback functions */
+ /* that contains pointers to callback functions. */
/* */
#ifdef __cplusplus
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 1cb5109..cae2fa3 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -393,20 +393,21 @@
/*************************************************************************/
/*************************************************************************/
- /*********************************************************************
- *
- * <Type>
- * FT_Face_Internal
- *
- * <Description>
- * an opaque handle to a FT_Face_InternalRec structure, used to
- * model private data of a given FT_Face object.
- *
- * this fields might change between releases of FreeType 2 and
- * are not generally available to client applications
- *
- */
- typedef struct FT_Face_InternalRec_* FT_Face_Internal;
+
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FT_Face_Internal */
+ /* */
+ /* <Description> */
+ /* An opaque handle to an FT_Face_InternalRec structure, used to */
+ /* model private data of a given FT_Face object. */
+ /* */
+ /* This field might change between releases of FreeType 2 and are */
+ /* not generally available to client applications. */
+ /* */
+ typedef struct FT_Face_InternalRec_* FT_Face_Internal;
+
/*************************************************************************/
/* */
@@ -571,76 +572,62 @@
/* */
/* sizes_list :: The list of child sizes for this face. */
/* */
- /* max_points :: The maximal number of points used to store */
- /* the vectorial outline of any glyph in this */
- /* face. If this value cannot be known in */
- /* advance, or if the face isn't scalable, */
- /* this should be set to 0. Only relevant for */
- /* scalable formats. */
- /* */
- /* max_contours :: The maximal number of contours used to */
- /* store the vectorial outline of any glyph in */
- /* this face. If this value cannot be known */
- /* in advance, or if the face isn't scalable, */
- /* this should be set to 0. Only relevant for */
- /* scalable formats. */
- /* */
- /* internal :: a pointer to internal fields of the face */
- /* object. These fields can change freely */
+ /* internal :: A pointer to internal fields of the face */
+ /* object. These fields can change freely */
/* between releases of FreeType and are not */
- /* publicly available.. */
+ /* publicly available. */
/* */
typedef struct FT_FaceRec_
{
- FT_Long num_faces;
- FT_Long face_index;
+ FT_Long num_faces;
+ FT_Long face_index;
- FT_Long face_flags;
- FT_Long style_flags;
+ FT_Long face_flags;
+ FT_Long style_flags;
- FT_Long num_glyphs;
+ FT_Long num_glyphs;
- FT_String* family_name;
- FT_String* style_name;
+ FT_String* family_name;
+ FT_String* style_name;
- FT_Int num_fixed_sizes;
- FT_Bitmap_Size* available_sizes;
+ FT_Int num_fixed_sizes;
+ FT_Bitmap_Size* available_sizes;
- FT_Int num_charmaps;
- FT_CharMap* charmaps;
+ FT_Int num_charmaps;
+ FT_CharMap* charmaps;
- FT_Generic generic;
+ FT_Generic generic;
- /*# the following are only relevant for scalable outlines */
- FT_BBox bbox;
+ /*# the following are only relevant to scalable outlines */
+ FT_BBox bbox;
- FT_UShort units_per_EM;
- FT_Short ascender;
- FT_Short descender;
- FT_Short height;
+ FT_UShort units_per_EM;
+ FT_Short ascender;
+ FT_Short descender;
+ FT_Short height;
- FT_Short max_advance_width;
- FT_Short max_advance_height;
+ FT_Short max_advance_width;
+ FT_Short max_advance_height;
- FT_Short underline_position;
- FT_Short underline_thickness;
+ FT_Short underline_position;
+ FT_Short underline_thickness;
- FT_GlyphSlot glyph;
- FT_Size size;
- FT_CharMap charmap;
+ FT_GlyphSlot glyph;
+ FT_Size size;
+ FT_CharMap charmap;
/*@private begin */
- FT_Driver driver;
- FT_Memory memory;
- FT_Stream stream;
+ FT_Driver driver;
+ FT_Memory memory;
+ FT_Stream stream;
- FT_ListRec sizes_list;
+ FT_ListRec sizes_list;
- FT_Generic autohint;
- void* extensions;
+ FT_Generic autohint;
+ void* extensions;
- FT_Face_Internal internal;
+ FT_Face_Internal internal;
/*@private end */
@@ -850,16 +837,17 @@
#define FT_STYLE_FLAG_BOLD 2
- /*********************************************************************
- *
- * <Type>
- * FT_Size_Internal
- *
- * <Description>
- * an opaque handle to a FT_Size_InternalRec structure, used to
- * model private data of a given FT_Size object.
- */
- typedef struct FT_Size_InternalRec_* FT_Size_Internal;
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FT_Size_Internal */
+ /* */
+ /* <Description> */
+ /* An opaque handle to an FT_Size_InternalRec structure, used to */
+ /* model private data of a given FT_Size object. */
+ /* */
+ typedef struct FT_Size_InternalRec_* FT_Size_Internal;
+
/*************************************************************************/
/* */
@@ -969,7 +957,6 @@
FT_Size_Metrics metrics; /* size metrics */
FT_Size_Internal internal;
-
} FT_SizeRec;
@@ -989,16 +976,16 @@
typedef struct FT_SubGlyph_ FT_SubGlyph;
- /*********************************************************************
- *
- * <Type>
- * FT_Slot_Internal
- *
- * <Description>
- * an opaque handle to a FT_Slot_InternalRec structure, used to
- * model private data of a given FT_GlyphSlot object.
- */
- typedef struct FT_Slot_InternalRec_* FT_Slot_Internal;
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FT_Slot_Internal */
+ /* */
+ /* <Description> */
+ /* An opaque handle to an FT_Slot_InternalRec structure, used to */
+ /* model private data of a given FT_GlyphSlot object. */
+ /* */
+ typedef struct FT_Slot_InternalRec_* FT_Slot_Internal;
/*************************************************************************/
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
index 1b26734..fa9529a 100644
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -321,9 +321,9 @@
/* this must be used internally for the moment */
FT_EXPORT( FT_Error ) FTC_Manager_Register_Cache(
- FTC_Manager manager,
- FTC_Cache_Class* clazz,
- FTC_Cache* acache );
+ FTC_Manager manager,
+ FTC_Cache_Class* clazz,
+ FTC_Cache* acache );
#ifdef __cplusplus
diff --git a/include/freetype/ftmac.h b/include/freetype/ftmac.h
index 1f35700..4664588 100644
--- a/include/freetype/ftmac.h
+++ b/include/freetype/ftmac.h
@@ -16,9 +16,13 @@
/***************************************************************************/
-/* NOTE: include this file after <freetype/freetype.h> and after the
- Mac-specific <Types.h> header (or any other Mac header that includes
- <Types.h>); we use Handle type. */
+/***************************************************************************/
+/* */
+/* NOTE: Include this file after <freetype/freetype.h> and after the */
+/* Mac-specific <Types.h> header (or any other Mac header that */
+/* includes <Types.h>); we use Handle type. */
+/* */
+/***************************************************************************/
#ifndef FT_MAC_H
@@ -60,10 +64,10 @@
/* error = FT_New_Face_From_FOND( library, fond, 0, &face ); */
/* */
FT_EXPORT_DEF( FT_Error ) FT_New_Face_From_FOND(
- FT_Library library,
- Handle fond,
- FT_Long face_index,
- FT_Face* aface );
+ FT_Library library,
+ Handle fond,
+ FT_Long face_index,
+ FT_Face* aface );
#ifdef __cplusplus
diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h
index e14c174..3d92c82 100644
--- a/include/freetype/ftmm.h
+++ b/include/freetype/ftmm.h
@@ -133,9 +133,9 @@
/* FreeType error code. 0 means success. */
/* */
FT_EXPORT( FT_Error ) FT_Set_MM_Design_Coordinates(
- FT_Face face,
- FT_UInt num_coords,
- FT_Long* coords );
+ FT_Face face,
+ FT_UInt num_coords,
+ FT_Long* coords );
/*************************************************************************/
@@ -160,9 +160,9 @@
/* FreeType error code. 0 means success. */
/* */
FT_EXPORT( FT_Error ) FT_Set_MM_Blend_Coordinates(
- FT_Face face,
- FT_UInt num_coords,
- FT_Fixed* coords );
+ FT_Face face,
+ FT_UInt num_coords,
+ FT_Fixed* coords );
#ifdef __cplusplus
diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h
index 6ba3c39..2862da9 100644
--- a/include/freetype/ftoutln.h
+++ b/include/freetype/ftoutln.h
@@ -53,9 +53,9 @@
/* FreeType error code. 0 means sucess. */
/* */
FT_EXPORT( FT_Error ) FT_Outline_Decompose(
- FT_Outline* outline,
- const FT_Outline_Funcs* interface,
- void* user );
+ FT_Outline* outline,
+ const FT_Outline_Funcs* interface,
+ void* user );
/*************************************************************************/
@@ -97,10 +97,10 @@
FT_EXPORT( FT_Error ) FT_Outline_New_Internal(
- FT_Memory memory,
- FT_UInt numPoints,
- FT_Int numContours,
- FT_Outline* outline );
+ FT_Memory memory,
+ FT_UInt numPoints,
+ FT_Int numContours,
+ FT_Outline* outline );
/*************************************************************************/
diff --git a/include/freetype/internal/ftextend.h b/include/freetype/internal/ftextend.h
index 39bb98b..32045b1 100644
--- a/include/freetype/internal/ftextend.h
+++ b/include/freetype/internal/ftextend.h
@@ -130,9 +130,8 @@
} FT_Extension_Class;
- FT_EXPORT( FT_Error ) FT_Register_Extension(
- FT_Driver driver,
- FT_Extension_Class* clazz );
+ FT_EXPORT( FT_Error ) FT_Register_Extension( FT_Driver driver,
+ FT_Extension_Class* clazz );
#ifdef FT_CONFIG_OPTION_EXTEND_ENGINE
@@ -161,10 +160,9 @@
/* return an extension's data & interface according to its ID */
- FT_EXPORT( void* ) FT_Get_Extension(
- FT_Face face,
- const char* extension_id,
- void** extension_interface );
+ FT_EXPORT( void* ) FT_Get_Extension( FT_Face face,
+ const char* extension_id,
+ void** extension_interface );
#ifdef __cplusplus
diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index be297c0..be9a45b 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -75,6 +75,7 @@
#define ABS( a ) ( (a) < 0 ? -(a) : (a) )
#endif
+
/*************************************************************************/
/* */
/* <Struct> */
@@ -97,35 +98,44 @@
/* FT_Face_InternalRec */
/* */
/* <Description> */
- /* this structure contains the internal fields of each FT_Face */
- /* object. These fields may change between different releases */
- /* of FreeType. */
+ /* This structure contains the internal fields of each FT_Face */
+ /* object. These fields may change between different releases of */
+ /* FreeType. */
/* */
/* <Fields> */
- /* transform_matrix :: A 2x2 matrix of 16.16 coefficients used */
- /* to transform glyph outlines after they are */
- /* loaded from the font. Only used by the */
- /* convenience functions. */
- /* */
- /* transform_delta :: A translation vector used to transform */
- /* glyph outlines after they are loaded from */
- /* the font. Only used by the convenience */
- /* functions. */
- /* */
- /* transform_flags :: Some flags used to classify the transform. */
- /* Only used by the convenience functions. */
- /* */
- /* */
- /* */
- /* */
- typedef struct FT_Face_InternalRec_
+ /* max_points :: The maximal number of points used to store the */
+ /* vectorial outline of any glyph in this face. */
+ /* If this value cannot be known in advance, or */
+ /* if the face isn't scalable, this should be set */
+ /* to 0. Only relevant for scalable formats. */
+ /* */
+ /* max_contours :: The maximal number of contours used to store */
+ /* the vectorial outline of any glyph in this */
+ /* face. If this value cannot be known in */
+ /* advance, or if the face isn't scalable, this */
+ /* should be set to 0. Only relevant for */
+ /* scalable formats. */
+ /* */
+ /* transform_matrix :: A 2x2 matrix of 16.16 coefficients used to */
+ /* transform glyph outlines after they are loaded */
+ /* from the font. Only used by the convenience */
+ /* functions. */
+ /* */
+ /* transform_delta :: A translation vector used to transform glyph */
+ /* outlines after they are loaded from the font. */
+ /* Only used by the convenience functions. */
+ /* */
+ /* transform_flags :: Some flags used to classify the transform. */
+ /* Only used by the convenience functions. */
+ /* */
+ typedef struct FT_Face_InternalRec_
{
- FT_UShort max_points;
- FT_Short max_contours;
+ FT_UShort max_points;
+ FT_Short max_contours;
- FT_Matrix transform_matrix;
- FT_Vector transform_delta;
- FT_Int transform_flags;
+ FT_Matrix transform_matrix;
+ FT_Vector transform_delta;
+ FT_Int transform_flags;
} FT_Face_InternalRec;
@@ -136,25 +146,25 @@
/* FT_Slot_InternalRec */
/* */
/* <Description> */
- /* this structure contains the internal fields of each FT_GlyphSlot */
- /* object. These fields may change between different releases */
- /* of FreeType. */
+ /* This structure contains the internal fields of each FT_GlyphSlot */
+ /* object. These fields may change between different releases of */
+ /* FreeType. */
/* */
/* <Fields> */
- /* loader :: the glyph loader object used to load */
- /* outlines in the glyph slot */
+ /* loader :: The glyph loader object used to load outlines */
+ /* into the glyph slot. */
/* */
- /* glyph_transformed :: boolean. set to TRUE when the loaded glyph */
+ /* glyph_transformed :: Boolean. Set to TRUE when the loaded glyph */
/* must be transformed through a specific */
- /* font transform. this is _not_ the same as */
- /* the face transform set through */
- /* FT_Set_Transform */
+ /* font transformation. This is _not_ the same */
+ /* as the face transform set through */
+ /* FT_Set_Transform(). */
/* */
- /* glyph_matrix :: the 2x2 matrix corresponding to the glyph */
- /* transform, when required */
+ /* glyph_matrix :: The 2x2 matrix corresponding to the glyph */
+ /* transformation, if necessary. */
/* */
- /* glyph_delta :: the 2d translation vector corresponding to */
- /* the glyph transform, when required */
+ /* glyph_delta :: The 2d translation vector corresponding to */
+ /* the glyph transformation, if necessary. */
/* */
typedef struct FT_Slot_InternalRec_
{
@@ -380,13 +390,13 @@
FT_BASE( void ) FT_GlyphLoader_Rewind( FT_GlyphLoader* loader );
FT_BASE( FT_Error ) FT_GlyphLoader_Check_Points(
- FT_GlyphLoader* loader,
- FT_UInt n_points,
- FT_UInt n_contours );
+ FT_GlyphLoader* loader,
+ FT_UInt n_points,
+ FT_UInt n_contours );
FT_BASE( FT_Error ) FT_GlyphLoader_Check_Subglyphs(
- FT_GlyphLoader* loader,
- FT_UInt n_subs );
+ FT_GlyphLoader* loader,
+ FT_UInt n_subs );
FT_BASE( void ) FT_GlyphLoader_Prepare( FT_GlyphLoader* loader );
@@ -573,12 +583,12 @@
FT_BASE( FT_Renderer ) FT_Lookup_Renderer( FT_Library library,
- FT_Glyph_Format format,
- FT_ListNode* node );
+ FT_Glyph_Format format,
+ FT_ListNode* node );
FT_BASE( FT_Error ) FT_Render_Glyph_Internal( FT_Library library,
- FT_GlyphSlot slot,
- FT_UInt render_mode );
+ FT_GlyphSlot slot,
+ FT_UInt render_mode );
typedef FT_Error (*FT_Glyph_Name_Requester)( FT_Face face,
FT_UInt glyph_index,
diff --git a/include/freetype/internal/ftstream.h b/include/freetype/internal/ftstream.h
index 87dcacf..e33147a 100644
--- a/include/freetype/internal/ftstream.h
+++ b/include/freetype/internal/ftstream.h
@@ -292,7 +292,7 @@
FT_BASE( FT_Char ) FT_Read_Char( FT_Stream stream,
- FT_Error* error );
+ FT_Error* error );
FT_BASE( FT_Short ) FT_Read_Short( FT_Stream stream,
FT_Error* error );
@@ -304,7 +304,7 @@
FT_Error* error );
FT_BASE( FT_Short ) FT_Read_ShortLE( FT_Stream stream,
- FT_Error* error );
+ FT_Error* error );
FT_BASE( FT_Long ) FT_Read_LongLE( FT_Stream stream,
FT_Error* error );
diff --git a/src/autohint/ahmodule.h b/src/autohint/ahmodule.h
index 65262e6..b631049 100644
--- a/src/autohint/ahmodule.h
+++ b/src/autohint/ahmodule.h
@@ -29,7 +29,8 @@
extern "C" {
#endif
- FT_CALLBACK_TABLE( const FT_Module_Class ) autohint_module_class;
+ FT_CALLBACK_TABLE
+ const FT_Module_Class autohint_module_class;
#ifdef __cplusplus
}
diff --git a/src/base/ftextend.c b/src/base/ftextend.c
index b99b823..5ad4574 100644
--- a/src/base/ftextend.c
+++ b/src/base/ftextend.c
@@ -119,14 +119,15 @@
/* */
/* <InOut> */
/* driver :: A handle to the driver object. */
+ /* */
/* class :: A pointer to a class describing the extension. */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
FT_EXPORT_DEF( FT_Error ) FT_Register_Extension(
- FT_Driver driver,
- FT_Extension_Class* clazz )
+ FT_Driver driver,
+ FT_Extension_Class* clazz )
{
FT_Extension_Registry* registry;
@@ -184,9 +185,9 @@
/* A generic pointer to the extension block. */
/* */
FT_EXPORT_DEF( void* ) FT_Get_Extension(
- FT_Face face,
- const char* extension_id,
- void** extension_interface )
+ FT_Face face,
+ const char* extension_id,
+ void** extension_interface )
{
FT_Extension_Registry* registry;
diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
index 5ae5d2b..d7f7384 100644
--- a/src/base/ftglyph.c
+++ b/src/base/ftglyph.c
@@ -424,7 +424,7 @@
/* FreeType error code. 0 means success. */
/* */
FT_EXPORT_DEF( FT_Error ) FT_Glyph_Copy( FT_Glyph source,
- FT_Glyph* target )
+ FT_Glyph* target )
{
FT_Glyph copy;
FT_Error error;
@@ -761,7 +761,7 @@
FT_EXPORT_DEF( FT_Error ) FT_Glyph_To_Bitmap( FT_Glyph* the_glyph,
FT_ULong render_mode,
FT_Vector* origin,
- FT_Bool destroy )
+ FT_Bool destroy )
{
FT_GlyphSlotRec dummy;
FT_Error error;
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index 704175f..8e7478d 100644
--- a/src/base/ftmm.c
+++ b/src/base/ftmm.c
@@ -95,9 +95,9 @@
/* FreeType error code. 0 means success. */
/* */
FT_EXPORT_DEF( FT_Error ) FT_Set_MM_Design_Coordinates(
- FT_Face face,
- FT_UInt num_coords,
- FT_Long* coords )
+ FT_Face face,
+ FT_UInt num_coords,
+ FT_Long* coords )
{
FT_Error error;
@@ -145,9 +145,9 @@
/* FreeType error code. 0 means success. */
/* */
FT_EXPORT_DEF( FT_Error ) FT_Set_MM_Blend_Coordinates(
- FT_Face face,
- FT_UInt num_coords,
- FT_Fixed* coords )
+ FT_Face face,
+ FT_UInt num_coords,
+ FT_Fixed* coords )
{
FT_Error error;
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 0bac579..4b97e2e 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -489,9 +489,9 @@
/* DOESN'T change the number of points within the loader! */
/* */
FT_BASE_DEF( FT_Error ) FT_GlyphLoader_Check_Points(
- FT_GlyphLoader* loader,
- FT_UInt n_points,
- FT_UInt n_contours )
+ FT_GlyphLoader* loader,
+ FT_UInt n_points,
+ FT_UInt n_contours )
{
FT_Memory memory = loader->memory;
FT_Error error = FT_Err_Ok;
@@ -549,8 +549,8 @@
/* NOT change the number of subglyphs within the loader! */
/* */
FT_BASE_DEF( FT_Error ) FT_GlyphLoader_Check_Subglyphs(
- FT_GlyphLoader* loader,
- FT_UInt n_subs )
+ FT_GlyphLoader* loader,
+ FT_UInt n_subs )
{
FT_Memory memory = loader->memory;
FT_Error error = FT_Err_Ok;
@@ -617,8 +617,9 @@
}
- FT_BASE_DEF( FT_Error ) FT_GlyphLoader_Copy_Points( FT_GlyphLoader* target,
- FT_GlyphLoader* source )
+ FT_BASE_DEF( FT_Error ) FT_GlyphLoader_Copy_Points(
+ FT_GlyphLoader* target,
+ FT_GlyphLoader* source )
{
FT_Error error;
FT_UInt num_points = source->base.outline.n_points;
@@ -679,7 +680,7 @@
slot->library = driver->root.library;
- if ( ALLOC( internal, sizeof( *internal ) ) )
+ if ( ALLOC( internal, sizeof ( *internal ) ) )
goto Exit;
slot->internal = internal;
@@ -1069,9 +1070,10 @@
if ( renderer )
- error = renderer->clazz->transform_glyph( renderer, slot,
- &internal->transform_matrix,
- &internal->transform_delta );
+ error = renderer->clazz->transform_glyph(
+ renderer, slot,
+ &internal->transform_matrix,
+ &internal->transform_delta );
/* transform advance */
FT_Vector_Transform( &slot->advance, &internal->transform_matrix );
}
@@ -1257,7 +1259,7 @@
if ( ALLOC( face, clazz->face_object_size ) )
goto Fail;
- if ( ALLOC( internal, sizeof(*internal) ) )
+ if ( ALLOC( internal, sizeof ( *internal ) ) )
goto Fail;
face->internal = internal;
@@ -2073,19 +2075,19 @@
/* FreeType error code. 0 means success. */
/* */
/* <Note> */
- /* the values of "pixel_width" and "pixel_height" correspond to */
- /* the pixel values of the _typographic_ character size, which are */
- /* NOT necessarily the same as the dimensions of the glyph */
- /* "bitmap cells". */
+ /* The values of `pixel_width' and `pixel_height' correspond to the */
+ /* pixel values of the _typographic_ character size, which are NOT */
+ /* necessarily the same as the dimensions of the glyph `bitmap */
+ /* cells". */
/* */
- /* The "character size" is really the size of an abstract square */
- /* called the "EM", used to design the font. However, depending */
+ /* The `character size' is really the size of an abstract square */
+ /* called the `EM', used to design the font. However, depending */
/* on the font design, glyphs will be smaller or greater than the */
/* EM. */
/* */
- /* this means that setting the pixel size to 8x8 doesn't guarantee */
- /* in any way that you'll end up with glyph bitmaps that all fit */
- /* within an 8x8 cell.. far from it.. */
+ /* This means that setting the pixel size to, say, 8x8 doesn't */
+ /* guarantee in any way that you will get glyph bitmaps that all fit */
+ /* within an 8x8 cell (sometimes even far from it). */
/* */
FT_EXPORT_DEF( FT_Error ) FT_Set_Pixel_Sizes( FT_Face face,
FT_UInt pixel_width,
@@ -2690,7 +2692,7 @@
FT_EXPORT( FT_Error ) FT_Set_Renderer( FT_Library library,
FT_Renderer renderer,
FT_UInt num_params,
- FT_Parameter* parameters )
+ FT_Parameter* parameters )
{
FT_ListNode node;
FT_Error error = FT_Err_Ok;
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index eee3a63..1477ec3 100644
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c
@@ -66,9 +66,9 @@
/* FreeType error code. 0 means sucess. */
/* */
FT_EXPORT_DEF( FT_Error ) FT_Outline_Decompose(
- FT_Outline* outline,
- const FT_Outline_Funcs* interface,
- void* user )
+ FT_Outline* outline,
+ const FT_Outline_Funcs* interface,
+ void* user )
{
#undef SCALED
#define SCALED( x ) ( ( (x) << shift ) - delta )
@@ -271,10 +271,10 @@
FT_EXPORT_DEF( FT_Error ) FT_Outline_New_Internal(
- FT_Memory memory,
- FT_UInt numPoints,
- FT_Int numContours,
- FT_Outline* outline )
+ FT_Memory memory,
+ FT_UInt numPoints,
+ FT_Int numContours,
+ FT_Outline* outline )
{
FT_Error error;
@@ -336,9 +336,9 @@
/* to use the library's memory allocator. */
/* */
FT_EXPORT_DEF( FT_Error ) FT_Outline_New( FT_Library library,
- FT_UInt numPoints,
- FT_Int numContours,
- FT_Outline* outline )
+ FT_UInt numPoints,
+ FT_Int numContours,
+ FT_Outline* outline )
{
if ( !library )
return FT_Err_Invalid_Library_Handle;
diff --git a/src/base/ftstream.c b/src/base/ftstream.c
index 3ffa69c..8f30e01 100644
--- a/src/base/ftstream.c
+++ b/src/base/ftstream.c
@@ -46,7 +46,7 @@
FT_BASE_DEF( FT_Error ) FT_Seek_Stream( FT_Stream stream,
- FT_ULong pos )
+ FT_ULong pos )
{
FT_Error error;
diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c
index f49419a..4858649 100644
--- a/src/base/ftsynth.c
+++ b/src/base/ftsynth.c
@@ -290,9 +290,9 @@
}
- FT_EXPORT_DEF(FT_Error) FT_Outline_Embolden( FT_GlyphSlot original,
- FT_Outline* outline,
- FT_Pos* advance )
+ FT_EXPORT_DEF( FT_Error ) FT_Outline_Embolden( FT_GlyphSlot original,
+ FT_Outline* outline,
+ FT_Pos* advance )
{
FT_Vector u, v;
FT_Vector* points;
diff --git a/src/cache/ftcchunk.c b/src/cache/ftcchunk.c
index d912320..bbea828 100644
--- a/src/cache/ftcchunk.c
+++ b/src/cache/ftcchunk.c
@@ -204,10 +204,10 @@
FT_EXPORT_DEF( FT_Error ) FTC_ChunkSet_Lookup_Node(
- FTC_ChunkSet cset,
- FT_UInt glyph_index,
- FTC_ChunkNode* anode,
- FT_UInt* aindex )
+ FTC_ChunkSet cset,
+ FT_UInt glyph_index,
+ FTC_ChunkNode* anode,
+ FT_UInt* aindex )
{
FTC_Chunk_Cache cache = cset->cache;
FTC_Manager manager = cache->root.manager;
diff --git a/src/cache/ftcglyph.c b/src/cache/ftcglyph.c
index ed6acd7..a4a6ce7 100644
--- a/src/cache/ftcglyph.c
+++ b/src/cache/ftcglyph.c
@@ -226,9 +226,9 @@
FT_EXPORT_DEF( FT_Error ) FTC_GlyphSet_Lookup_Node(
- FTC_GlyphSet gset,
- FT_UInt glyph_index,
- FTC_GlyphNode* anode )
+ FTC_GlyphSet gset,
+ FT_UInt glyph_index,
+ FTC_GlyphNode* anode )
{
FTC_Glyph_Cache cache = gset->cache;
FTC_Manager manager = cache->root.manager;
diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c
index 588edb6..15aa57b 100644
--- a/src/cache/ftcmanag.c
+++ b/src/cache/ftcmanag.c
@@ -426,9 +426,9 @@
FT_EXPORT( FT_Error ) FTC_Manager_Register_Cache(
- FTC_Manager manager,
- FTC_Cache_Class* clazz,
- FTC_Cache* acache )
+ FTC_Manager manager,
+ FTC_Cache_Class* clazz,
+ FTC_Cache* acache )
{
FT_Error error = FT_Err_Invalid_Argument;
diff --git a/src/cff/t2driver.h b/src/cff/t2driver.h
index 1c62a28..7b3bc4d 100644
--- a/src/cff/t2driver.h
+++ b/src/cff/t2driver.h
@@ -26,7 +26,8 @@
#endif
- FT_CALLBACK_TABLE const FT_Driver_Class cff_driver_class;
+ FT_CALLBACK_TABLE
+ const FT_Driver_Class cff_driver_class;
#ifdef __cplusplus
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index fc1ecc6..266b499 100644
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -151,7 +151,7 @@
/* FreeType error code. 0 means success. An error is returned if a */
/* reallocation fails. */
/* */
- FT_LOCAL
+ FT_LOCAL_DEF
FT_Error PS_Table_Add( PS_Table* table,
FT_Int index,
void* object,
diff --git a/src/psaux/t1decode.h b/src/psaux/t1decode.h
index ede52ca..b5f0f5d 100644
--- a/src/psaux/t1decode.h
+++ b/src/psaux/t1decode.h
@@ -29,7 +29,8 @@
#endif
- FT_CALLBACK_TABLE const T1_Decoder_Funcs t1_decoder_funcs;
+ FT_CALLBACK_TABLE
+ const T1_Decoder_Funcs t1_decoder_funcs;
FT_LOCAL
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index 2c1c0c5..1aa53e1 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -43,14 +43,18 @@
#define FT_COMPONENT trace_ttcmap
- FT_CALLBACK_DEF FT_UInt code_to_index0( TT_CMapTable* charmap,
- FT_ULong char_code );
- FT_CALLBACK_DEF FT_UInt code_to_index2( TT_CMapTable* charmap,
- FT_ULong char_code );
- FT_CALLBACK_DEF FT_UInt code_to_index4( TT_CMapTable* charmap,
- FT_ULong char_code );
- FT_CALLBACK_DEF FT_UInt code_to_index6( TT_CMapTable* charmap,
- FT_ULong char_code );
+ FT_CALLBACK_DEF
+ FT_UInt code_to_index0( TT_CMapTable* charmap,
+ FT_ULong char_code );
+ FT_CALLBACK_DEF
+ FT_UInt code_to_index2( TT_CMapTable* charmap,
+ FT_ULong char_code );
+ FT_CALLBACK_DEF
+ FT_UInt code_to_index4( TT_CMapTable* charmap,
+ FT_ULong char_code );
+ FT_CALLBACK_DEF
+ FT_UInt code_to_index6( TT_CMapTable* charmap,
+ FT_ULong char_code );
/*************************************************************************/
diff --git a/src/smooth/ftgrays.h b/src/smooth/ftgrays.h
index 0e94713..e1792c2 100644
--- a/src/smooth/ftgrays.h
+++ b/src/smooth/ftgrays.h
@@ -31,7 +31,7 @@
/*************************************************************************/
/* */
/* To make ftgrays.h independent from configuration files we check */
- /* whether FT_EXPORT has been defined already. */
+ /* whether FT_EXPORT has been defined already. */
/* */
/* On some systems and compilers (Win32 mostly), an extra keyword is */
/* necessary to compile the library as a DLL. */
diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h
index 84ecf4d..829bae0 100644
--- a/src/truetype/ttobjs.h
+++ b/src/truetype/ttobjs.h
@@ -109,12 +109,14 @@
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
- FT_LOCAL void TT_Done_GlyphZone( TT_GlyphZone* zone );
+ FT_LOCAL
+ void TT_Done_GlyphZone( TT_GlyphZone* zone );
- FT_LOCAL FT_Error TT_New_GlyphZone( FT_Memory memory,
- FT_UShort maxPoints,
- FT_Short maxContours,
- TT_GlyphZone* zone );
+ FT_LOCAL
+ FT_Error TT_New_GlyphZone( FT_Memory memory,
+ FT_UShort maxPoints,
+ FT_Short maxContours,
+ TT_GlyphZone* zone );
#endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c
index e6bd317..ef258e1 100644
--- a/src/type1/t1gload.c
+++ b/src/type1/t1gload.c
@@ -219,9 +219,9 @@
glyph->root.metrics.horiBearingX = decoder.builder.left_bearing.x;
glyph->root.metrics.horiAdvance = decoder.builder.advance.x;
- internal->glyph_matrix = font_matrix;
- internal->glyph_delta = font_offset;
- internal->glyph_transformed = 1;
+ internal->glyph_matrix = font_matrix;
+ internal->glyph_delta = font_offset;
+ internal->glyph_transformed = 1;
}
else
{
@@ -230,8 +230,8 @@
/* copy the _unscaled_ advance width */
- metrics->horiAdvance = decoder.builder.advance.x;
- glyph->root.linearHoriAdvance = decoder.builder.advance.x;
+ metrics->horiAdvance = decoder.builder.advance.x;
+ glyph->root.linearHoriAdvance = decoder.builder.advance.x;
glyph->root.internal->glyph_transformed = 0;
/* make up vertical metrics */