Commit 8e6f8c4d7934b8725463cabb3ba18bf086b908d7
2006-02-17T08:07:09
Formatting, copyright years, documentation improvements.
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 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518
diff --git a/ChangeLog b/ChangeLog
index 5fb84f1..797efdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,25 +1,53 @@
2006-02-16 David Turner <david@freetype.org>
- * builds/amiga/src/base/ftsystem.c, devel/ftoption.h
- include/freetype/ftcache.h, include/freetype/ftoutln.h,
- include/freetype/cache/ftccache.h, include/freetype/cache/ftccmap.h,
- include/freetype/config/ftoption.h, include/freetype/internal/ftcalc.h,
- include/freetype/internal/ftdriver.h,
- include/freetype/internal/ftmemory.h,
- include/freetype/internal/ftobjs.h, include/freetype/internal/ftrfork.h,
- include/freetype/internal/psaux.h, include/freetype/internal/sfnt.h,
- include/freetype/internal/t1types.h, include/freetype/internal/tttypes.h,
- src/base/ftcalc.c, src/base/ftdbgmem.c, src/base/ftobjs.c,
- src/base/ftsystem.c, src/base/ftutil.c, src/bdf/bdfdrivr.c,
- src/cache/ftccache.c, src/cache/ftccback.h, src/cache/ftccmap.c,
- src/cache/ftcmanag.c, src/cff/cffdrivr.c, src/cid/cidriver.c,
- src/pcf/pcfdrivr.c, src/pfr/pfrdrivr.c, src/psaux/psauxmod.c,
- src/sfnt/sfdriver.c, src/truetype/ttdriver.c, src/type1/t1driver.c,
- src/type1/t1objs.c, src/type42/t42drivr.c, src/winfonts/winfnt.c:
-
- massive changes to the internals to respect the internal object layouts
- and exported functions of FreeType 2.1.7. Note that the cache sub-system
- cannot be fully retrofitted, unfortunately.
+ Massive changes to the internals to respect the internal object
+ layouts and exported functions of FreeType 2.1.7. Note that the
+ cache sub-system cannot be fully retrofitted, unfortunately.
+
+ * include/freetype/config/ftoption.h
+ (FT_CONFIG_OPTION_OLD_INTERNALS): New macro.
+
+ * include/freetype/ftcache.h, include/freetype/cache/ftccache.h,
+ include/freetype/cache/ftccmap.h,
+ include/freetype/internal/ftcalc.h,
+ include/freetype/internal/ftdriver.h,
+ include/freetype/internal/ftmemory.h,
+ include/freetype/internal/ftobjs.h,
+ include/freetype/internal/psaux.h, include/freetype/internal/sfnt.h,
+ include/freetype/internal/t1types.h,
+ include/freetype/internal/tttypes.h, src/base/ftcalc.c,
+ src/base/ftdbgmem.c, src/base/ftobjs.c, src/base/ftutil.c,
+ src/bdf/bdfdrivr.c, src/cache/ftccache.c, src/cache/ftccback.h,
+ src/cache/ftcmanag.c, src/cff/cffdrivr.c, src/cid/cidriver.c,
+ src/pcf/pcfdrivr.c, src/pfr/pfrdrivr.c, src/psaux/psauxmod.c,
+ src/sfnt/sfdriver.c, src/truetype/ttdriver.c, src/type1/t1driver.c,
+ src/type1/t1objs.c, src/type42/t42drivr.c, src/winfonts/winfnt.c:
+ Use FT_CONFIG_OPTION_OLD_INTERNALS to revive old functions and data
+ structures.
+
+ Move newly added structure elements to the end of the affected
+ structure and add stub fields (if FT_CONFIG_OPTION_OLD_INTERNALS is
+ defined) to assure binary compatibility with older FreeType
+ versions.
+ Use FT_CONFIG_OPTION_OLD_INTERNALS to add function stubs for old
+ functions:
+
+ ft_stub_set_char_sizes
+ ft_stub_set_pixel_sizes
+
+ Rename the following internal functions to provide the old function
+ names as stubs:
+
+ FT_Alloc -> ft_mem_alloc
+ FT_QAlloc -> ft_mem_qalloc
+ FT_Realloc -> ft_mem_realloc
+ FT_QRealloc -> ft_mem_qrealloc
+ FT_Free -> ft_mem_free
+ FT_Alloc_Debug -> ft_mem_alloc_debug
+ FT_QAlloc_Debug -> ft_mem_qalloc_debug
+ FT_Realloc_Debug -> ft_mem_realloc_debug
+ FT_QRealloc_Debug -> ft_mem_qrealloc_debug
+ FT_Free_Debug -> ft_mem_free_debug
2006-02-15 Chia-I Wu <b90201047@ntu.edu.tw>
@@ -47,23 +75,23 @@
possible segment faults for the non-FT_OPTIMIZE_MEMORY'ed versions.
(finally!)
+
For most OpenType tables, `tt_face_load_xxxx' simply loads the table
and `face->root' is set later in `sfnt_load_face'. Here, we try to
- make this work for _all_ tables.
+ make this work for _all_ tables. Also improve tracing messages.
* src/sfnt/ttsbit.c, src/sfnt/ttsbit0.c, src/sfnt/ttload.c,
src/sfnt/ttmtx.c: all `tt_face_load_xxxx' should load the table and
then exit. Error handling or setting face->root is done later in
`sfnt_load_face'.
- Pretty trace messages.
* src/sfnt/sfobjs.c (sfnt_load_face): Work harder.
Mac bitmap-only fonts are not scalable.
Check that `face->header.Units_Per_EM' is not zero.
- (LOAD_, LOADM_): Pretty trace messages.
+ (LOAD_, LOADM_): Emit pretty trace messages.
- * src/sfnt/ttsbit0.c (tt_face_load_strike_metrics): Read metrics from
- `eblc'.
+ * src/sfnt/ttsbit0.c (tt_face_load_strike_metrics): Read metrics
+ from `eblc'.
* src/sfnt/ttcmap.c (tt_face_build_cmaps), src/sfnt/ttpost.c
(load_format_20, load_format_25, tt_face_get_ps_name): Use
diff --git a/builds/amiga/src/base/ftsystem.c b/builds/amiga/src/base/ftsystem.c
index 1eb63df..725f78d 100644
--- a/builds/amiga/src/base/ftsystem.c
+++ b/builds/amiga/src/base/ftsystem.c
@@ -4,7 +4,7 @@
/* */
/* Amiga-specific FreeType low-level system interface (body). */
/* */
-/* Copyright 1996-2001, 2002, 2005 by */
+/* Copyright 1996-2001, 2002, 2005, 2006 by */
/* David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -115,8 +115,8 @@ Free_VecPooled( APTR poolHeader,
/*************************************************************************/
/* */
/* It is not necessary to do any error checking for the */
- /* allocation-related functions. This will be done by the higher level */
- /* routines like ft_mem_alloc() or ft_mem_realloc(). */
+ /* allocation-related functions. This is done by the higher level */
+ /* routines like ft_mem_alloc() or ft_mem_realloc(). */
/* */
/*************************************************************************/
diff --git a/devel/ftoption.h b/devel/ftoption.h
index 742edb2..3e0efe2 100644
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -566,10 +566,10 @@ FT_BEGIN_HEADER
/*
- * This temporary macro is used to control whether we are going to
- * compile certain functions like ft_mem_alloc in a way that prevents recent
- * GCC releases from emitting zillions of `strict aliasing' warning
- * messages each time a memory-management function is called.
+ * This temporary macro is used to control whether we are going to compile
+ * certain functions like ft_mem_alloc in a way that prevents recent GCC
+ * releases from emitting zillions of `strict aliasing' warning messages
+ * each time a memory-management function is called.
*/
#define FT_STRICT_ALIASING
diff --git a/include/freetype/cache/ftccache.h b/include/freetype/cache/ftccache.h
index 3bd2476..f7241af 100644
--- a/include/freetype/cache/ftccache.h
+++ b/include/freetype/cache/ftccache.h
@@ -4,7 +4,7 @@
/* */
/* FreeType internal cache interface (specification). */
/* */
-/* Copyright 2000-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -82,17 +82,18 @@ FT_BEGIN_HEADER
FTC_Node_Destroy( FTC_Node node,
FTC_Manager manager );
+
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
FT_BASE( void )
ftc_node_destroy( FTC_Node node,
FTC_Manager manager );
-
+
FT_BASE( void )
ftc_node_done( FTC_Node node,
FTC_Manager manager );
-
#endif
+
/*************************************************************************/
/*************************************************************************/
/***** *****/
diff --git a/include/freetype/cache/ftccmap.h b/include/freetype/cache/ftccmap.h
index 0b97704..638dc4b 100644
--- a/include/freetype/cache/ftccmap.h
+++ b/include/freetype/cache/ftccmap.h
@@ -4,7 +4,7 @@
/* */
/* FreeType charmap cache (specification). */
/* */
-/* Copyright 2000-2001, 2003, 2005 by */
+/* Copyright 2000-2001, 2003, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -25,12 +25,14 @@
FT_BEGIN_HEADER
-/* the FT 2.1.7 Charmap cache interface
- *
- * unfortunately, it is not possible to implement it in later
- * versions, since some function signature changed too significantly
- * to do that.
- */
+
+ /*
+ * The FreeType 2.1.7 Charmap cache interface.
+ *
+ * Unfortunately, it is not possible to implement it in later versions,
+ * since some function signatures changed too significantly to do that.
+ *
+ */
#if 0
@@ -67,7 +69,6 @@ FT_BEGIN_HEADER
} FTC_CMapDescRec, *FTC_CMapDesc;
-#if 0
FT_EXPORT( FT_Error )
FTC_CMapCache_New( FTC_Manager manager,
FTC_CMapCache *acache );
@@ -77,12 +78,12 @@ FT_BEGIN_HEADER
FTC_CMapCache_Lookup( FTC_CMapCache cache,
FTC_CMapDesc cmap_desc,
FT_UInt32 char_code );
-#endif
-#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
+#endif /* 0 */
/* */
+
FT_END_HEADER
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 3370409..bb1bbee 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -578,22 +578,26 @@ FT_BEGIN_HEADER
* This temporary macro is used to control various optimizations for
* reducing the heap footprint of memory-mapped TrueType files.
*/
-#define FT_OPTIMIZE_MEMORY
+#define FT_OPTIMIZE_MEMORY
/*
- * This temporary macro is used to control whether we are going to
- * compile certain functions like ft_mem_alloc in a way that prevents recent
- * GCC releases from emitting zillions of `strict aliasing' warning
- * messages each time a memory-management function is called.
+ * This temporary macro is used to control whether we are going to compile
+ * certain functions like ft_mem_alloc in a way that prevents recent GCC
+ * releases from emitting zillions of `strict aliasing' warning messages
+ * each time a memory-management function is called.
*/
-#define FT_STRICT_ALIASING
+#define FT_STRICT_ALIASING
+
+
+ /*
+ * Define this variable if you want to keep the layout of internal
+ * structures that was used prior to FreeType 2.2. This also compiles in
+ * a few obsolete functions to avoid linking problems on typical Unix
+ * distributions.
+ */
+#define FT_CONFIG_OPTION_OLD_INTERNALS
-/* define this variable if you want to keep the layout of internal structures
- * that was used prior to FreeType 2.2. This also compiles in a few obsolete
- * functions to avoid linking problems on typical Unix distributions
- */
-#define FT_CONFIG_OPTION_OLD_INTERNALS
FT_END_HEADER
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
index fdc6b94..f0910df 100644
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -4,7 +4,7 @@
/* */
/* FreeType Cache subsystem (specification). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -844,6 +844,7 @@ FT_BEGIN_HEADER
#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
+
/* */
FT_END_HEADER
diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h
index 96412d3..946af73 100644
--- a/include/freetype/ftoutln.h
+++ b/include/freetype/ftoutln.h
@@ -176,7 +176,7 @@ FT_BEGIN_HEADER
/* descriptor will be released. */
/* */
/* The reason why this function takes an `library' parameter is */
- /* simply to use ft_mem_free(). */
+ /* simply to use ft_mem_free(). */
/* */
FT_EXPORT( FT_Error )
FT_Outline_Done( FT_Library library,
diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h
index 1fe2f7b..53d7a67 100644
--- a/include/freetype/internal/ftcalc.h
+++ b/include/freetype/internal/ftcalc.h
@@ -4,7 +4,7 @@
/* */
/* Arithmetic computations (specification). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004,2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/include/freetype/internal/ftdriver.h b/include/freetype/internal/ftdriver.h
index dd86db9..44992d2 100644
--- a/include/freetype/internal/ftdriver.h
+++ b/include/freetype/internal/ftdriver.h
@@ -59,7 +59,9 @@ FT_BEGIN_HEADER
typedef FT_Error
(*FT_Size_SelectFunc)( FT_Size size,
FT_ULong size_index );
+
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
+
typedef FT_Error
(*FT_Size_ResetPointsFunc)( FT_Size size,
FT_F26Dot6 char_width,
@@ -71,6 +73,7 @@ FT_BEGIN_HEADER
(*FT_Size_ResetPixelsFunc)( FT_Size size,
FT_UInt pixel_width,
FT_UInt pixel_height );
+
#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
typedef FT_Error
@@ -198,8 +201,10 @@ FT_BEGIN_HEADER
FT_Slot_DoneFunc done_slot;
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
+
FT_Size_ResetPointsFunc set_char_sizes;
FT_Size_ResetPixelsFunc set_pixel_sizes;
+
#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
FT_Slot_LoadFunc load_glyph;
@@ -208,20 +213,22 @@ FT_BEGIN_HEADER
FT_Face_AttachFunc attach_file;
FT_Face_GetAdvancesFunc get_advances;
- /* since FT 2.2. */
+ /* since version 2.2 */
FT_Size_RequestFunc request_size;
FT_Size_SelectFunc select_size;
} FT_Driver_ClassRec, *FT_Driver_Class;
-/* the following are used as stubs for 'set_char_sizes'
- * and 'set_pixel_sizes'. their implementation uses
- * 'request_size' and 'select_size' functions instead
- *
- * implementation is in src/base/ftobjs.c
- */
+ /*
+ * The following functions are used as stubs for `set_char_sizes' and
+ * `set_pixel_sizes'; the code uses `request_size' and `select_size'
+ * functions instead.
+ *
+ * Implementation is in `src/base/ftobjs.c'.
+ */
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
+
FT_BASE( FT_Error )
ft_stub_set_char_sizes( FT_Size size,
FT_F26Dot6 width,
@@ -230,11 +237,13 @@ FT_BEGIN_HEADER
FT_UInt vert_res );
FT_BASE( FT_Error )
- ft_stub_set_pixel_sizes( FT_Size size,
- FT_UInt width,
- FT_UInt height );
+ ft_stub_set_pixel_sizes( FT_Size size,
+ FT_UInt width,
+ FT_UInt height );
+
#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
+
FT_END_HEADER
#endif /* __FTDRIVER_H__ */
diff --git a/include/freetype/internal/ftmemory.h b/include/freetype/internal/ftmemory.h
index 0114ffa..8547c8d 100644
--- a/include/freetype/internal/ftmemory.h
+++ b/include/freetype/internal/ftmemory.h
@@ -136,59 +136,60 @@ FT_BEGIN_HEADER
const char* file_name,
FT_Long line_no );
-#define FT_MEM_ALLOC( _pointer_, _size_ ) \
+
+#define FT_MEM_ALLOC( _pointer_, _size_ ) \
(_pointer_) = ft_mem_alloc_debug( memory, _size_, &error, \
- __FILE__, __LINE__ )
+ __FILE__, __LINE__ )
-#define FT_MEM_REALLOC( _pointer_, _current_, _size_ ) \
+#define FT_MEM_REALLOC( _pointer_, _current_, _size_ ) \
(_pointer_) = ft_mem_realloc_debug( memory, _current_, _size_, \
- (_pointer_), &error, \
- __FILE__, __LINE__ )
+ (_pointer_), &error, \
+ __FILE__, __LINE__ )
-#define FT_MEM_QALLOC( _pointer_, _size_ ) \
+#define FT_MEM_QALLOC( _pointer_, _size_ ) \
(_pointer_) = ft_mem_qalloc_debug( memory, _size_, &error, \
- __FILE__, __LINE__ )
+ __FILE__, __LINE__ )
-#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ ) \
+#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ ) \
(_pointer_) = ft_mem_qrealloc_debug( memory, _current_, _size_, \
- (_pointer_), &error, \
- __FILE__, __LINE__ )
+ (_pointer_), &error, \
+ __FILE__, __LINE__ )
-#define FT_MEM_FREE( _pointer_ ) \
- FT_BEGIN_STMNT \
- if ( _pointer_ ) \
- { \
+#define FT_MEM_FREE( _pointer_ ) \
+ FT_BEGIN_STMNT \
+ if ( _pointer_ ) \
+ { \
ft_mem_free_debug( memory, (_pointer_), __FILE__, __LINE__ ); \
- (_pointer_) = NULL; \
- } \
+ (_pointer_) = NULL; \
+ } \
FT_END_STMNT
#else /* !FT_DEBUG_MEMORY */
-#define FT_MEM_ALLOC( _pointer_, _size_ ) \
+#define FT_MEM_ALLOC( _pointer_, _size_ ) \
(_pointer_) = ft_mem_alloc( memory, _size_, &error )
-#define FT_MEM_FREE( _pointer_ ) \
- FT_BEGIN_STMNT \
- if ( (_pointer_) ) \
- { \
+#define FT_MEM_FREE( _pointer_ ) \
+ FT_BEGIN_STMNT \
+ if ( (_pointer_) ) \
+ { \
ft_mem_free( memory, (_pointer_) ); \
- (_pointer_) = NULL; \
- } \
+ (_pointer_) = NULL; \
+ } \
FT_END_STMNT
-#define FT_MEM_REALLOC( _pointer_, _current_, _size_ ) \
+#define FT_MEM_REALLOC( _pointer_, _current_, _size_ ) \
(_pointer_) = ft_mem_realloc( memory, _current_, _size_, \
- (_pointer_), &error )
+ (_pointer_), &error )
-#define FT_MEM_QALLOC( _pointer_, _size_ ) \
+#define FT_MEM_QALLOC( _pointer_, _size_ ) \
(_pointer_) = ft_mem_qalloc( memory, _size_, &error )
-#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ ) \
+#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ ) \
(_pointer_) = ft_mem_qrealloc( memory, _current_, _size_, \
- (_pointer_), &error )
+ (_pointer_), &error )
#endif /* !FT_DEBUG_MEMORY */
@@ -245,7 +246,7 @@ FT_BEGIN_HEADER
/*************************************************************************/
/* */
/* <Function> */
- /* ft_mem_alloc */
+ /* ft_mem_alloc */
/* */
/* <Description> */
/* Allocates a new block of memory. The returned area is always */
@@ -398,53 +399,53 @@ FT_BEGIN_HEADER
#ifdef FT_DEBUG_MEMORY
-#define FT_MEM_ALLOC( _pointer_, _size_ ) \
+#define FT_MEM_ALLOC( _pointer_, _size_ ) \
ft_mem_alloc_debug( memory, _size_, \
- (void**)(void*)&(_pointer_), \
- __FILE__, __LINE__ )
+ (void**)(void*)&(_pointer_), \
+ __FILE__, __LINE__ )
-#define FT_MEM_REALLOC( _pointer_, _current_, _size_ ) \
+#define FT_MEM_REALLOC( _pointer_, _current_, _size_ ) \
ft_mem_realloc_debug( memory, _current_, _size_, \
- (void**)(void*)&(_pointer_), \
- __FILE__, __LINE__ )
+ (void**)(void*)&(_pointer_), \
+ __FILE__, __LINE__ )
-#define FT_MEM_QALLOC( _pointer_, _size_ ) \
+#define FT_MEM_QALLOC( _pointer_, _size_ ) \
ft_mem_qalloc_debug( memory, _size_, \
- (void**)(void*)&(_pointer_), \
- __FILE__, __LINE__ )
+ (void**)(void*)&(_pointer_), \
+ __FILE__, __LINE__ )
-#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ ) \
+#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ ) \
ft_mem_qrealloc_debug( memory, _current_, _size_, \
- (void**)(void*)&(_pointer_), \
- __FILE__, __LINE__ )
+ (void**)(void*)&(_pointer_), \
+ __FILE__, __LINE__ )
-#define FT_MEM_FREE( _pointer_ ) \
+#define FT_MEM_FREE( _pointer_ ) \
ft_mem_free_debug( memory, (void**)(void*)&(_pointer_), \
- __FILE__, __LINE__ )
+ __FILE__, __LINE__ )
#else /* !FT_DEBUG_MEMORY */
-#define FT_MEM_ALLOC( _pointer_, _size_ ) \
+#define FT_MEM_ALLOC( _pointer_, _size_ ) \
ft_mem_alloc( memory, _size_, \
- (void**)(void*)&(_pointer_) )
+ (void**)(void*)&(_pointer_) )
-#define FT_MEM_FREE( _pointer_ ) \
+#define FT_MEM_FREE( _pointer_ ) \
ft_mem_free( memory, \
- (void**)(void*)&(_pointer_) )
+ (void**)(void*)&(_pointer_) )
-#define FT_MEM_REALLOC( _pointer_, _current_, _size_ ) \
- ft_mem_realloc( memory, _current_, _size_, \
- (void**)(void*)&(_pointer_) )
+#define FT_MEM_REALLOC( _pointer_, _current_, _size_ ) \
+ ft_mem_realloc( memory, _current_, _size_, \
+ (void**)(void*)&(_pointer_) )
-#define FT_MEM_QALLOC( _pointer_, _size_ ) \
+#define FT_MEM_QALLOC( _pointer_, _size_ ) \
ft_mem_qalloc( memory, _size_, \
- (void**)(void*)&(_pointer_) )
+ (void**)(void*)&(_pointer_) )
-#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ ) \
- ft_mem_qrealloc( memory, _current_, _size_, \
- (void**)(void*)&(_pointer_) )
+#define FT_MEM_QREALLOC( _pointer_, _current_, _size_ ) \
+ ft_mem_qrealloc( memory, _current_, _size_, \
+ (void**)(void*)&(_pointer_) )
#endif /* !FT_DEBUG_MEMORY */
diff --git a/include/freetype/internal/ftrfork.h b/include/freetype/internal/ftrfork.h
index 4909491..94402bc 100644
--- a/include/freetype/internal/ftrfork.h
+++ b/include/freetype/internal/ftrfork.h
@@ -4,7 +4,7 @@
/* */
/* Embedded resource forks accessor (specification). */
/* */
-/* Copyright 2004 by */
+/* Copyright 2004, 2006 by */
/* Masatake YAMATO and Redhat K.K. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -154,7 +154,7 @@ FT_BEGIN_HEADER
/* offsets :: */
/* The stream offsets for the resource data specified by `tag'. */
/* This array is allocated by the function, so you have to call */
- /* @ft_mem_free after use. */
+ /* @ft_mem_free after use. */
/* */
/* count :: */
/* The length of offsets array. */
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index 43017dd..6f8ba6c 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -792,7 +792,7 @@ FT_BEGIN_HEADER
T1_CMap_Classes t1_cmap_classes;
- /* fields from here were added after 2.1.10 */
+ /* fields after this comment line were added after version 2.1.10 */
const AFM_Parser_FuncsRec* afm_parser_funcs;
} PSAux_ServiceRec, *PSAux_Service;
diff --git a/include/freetype/internal/sfnt.h b/include/freetype/internal/sfnt.h
index 27d76c0..b9d0ab9 100644
--- a/include/freetype/internal/sfnt.h
+++ b/include/freetype/internal/sfnt.h
@@ -126,6 +126,7 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
+
/*************************************************************************/
/* */
/* <FuncType> */
@@ -164,7 +165,6 @@ FT_BEGIN_HEADER
SFNT_Header sfnt );
-
/*************************************************************************/
/* */
/* <FuncType> */
@@ -174,11 +174,11 @@ FT_BEGIN_HEADER
/* Loads the table directory into a face object. */
/* */
/* <Input> */
- /* face :: A handle to the target face object. */
+ /* face :: A handle to the target face object. */
/* */
- /* stream :: The input stream. */
+ /* stream :: The input stream. */
/* */
- /* sfnt :: The SFNT header. */
+ /* sfnt :: The SFNT header. */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */
@@ -192,8 +192,10 @@ FT_BEGIN_HEADER
(*TT_Load_Directory_Func)( TT_Face face,
FT_Stream stream,
SFNT_Header sfnt );
+
#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
+
/*************************************************************************/
/* */
/* <FuncType> */
@@ -362,6 +364,7 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
+
/*************************************************************************/
/* */
/* <FuncType> */
@@ -388,6 +391,7 @@ FT_BEGIN_HEADER
FT_UInt y_ppem,
FT_ULong* astrike_index );
+
/*************************************************************************/
/* */
/* <FuncType> */
@@ -413,9 +417,9 @@ FT_BEGIN_HEADER
/* released. */
/* */
typedef FT_Error
- (*TT_CharMap_Load_Func)( TT_Face face,
- void* cmap,
- FT_Stream input );
+ (*TT_CharMap_Load_Func)( TT_Face face,
+ void* cmap,
+ FT_Stream input );
/*************************************************************************/
@@ -440,6 +444,7 @@ FT_BEGIN_HEADER
#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
+
/*************************************************************************/
/* */
/* <FuncType> */
@@ -651,6 +656,7 @@ FT_BEGIN_HEADER
FT_Module_Requester get_interface;
TT_Load_Any_Func load_any;
+
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
TT_Load_SFNT_HeaderRec_Func load_sfnt_header;
TT_Load_Directory_Func load_directory;
@@ -673,13 +679,16 @@ FT_BEGIN_HEADER
TT_Load_Table_Func load_hdmx_stub;
TT_Free_Table_Func free_hdmx_stub;
#endif
- TT_Load_Table_Func load_kern; /* a.k.a load_kerning <= 2.1.10 */
+
+ /* this field was called `load_kerning' up to version 2.1.10 */
+ TT_Load_Table_Func load_kern;
TT_Load_Table_Func load_gasp;
TT_Load_Table_Func load_pclt;
- /* see `ttload.h' */
- TT_Load_Table_Func load_bhed; /* a.k.a load_bitmap_header <= 2.1.10 */
+ /* see `ttload.h'; this field was called `load_bitmap_header' up to */
+ /* version 2.1.10 */
+ TT_Load_Table_Func load_bhed;
/* see `ttsbit.h' */
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
@@ -688,6 +697,7 @@ FT_BEGIN_HEADER
#endif
TT_Load_SBit_Image_Func load_sbit_image;
+
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
TT_Free_Table_Func free_sbits_stub;
#endif
@@ -696,23 +706,24 @@ FT_BEGIN_HEADER
TT_Get_PS_Name_Func get_psname;
TT_Free_Table_Func free_psnames;
-#ifdef FT_CONFIG_OPTION_OLD_INTERNALS /* the following disappeared in 2.1.8, but were there before */
+#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
TT_CharMap_Load_Func load_charmap_stub;
TT_CharMap_Free_Func free_charmap_stub;
#endif
- /* from here, the structure differs from 2.1.7 */
+ /* starting here, the structure differs from version 2.1.7 */
- /* since FT 2.1.8, but appeared before 'get_psname' */
+ /* this field was introduced in version 2.1.8, named `get_psname' */
TT_Face_GetKerningFunc get_kerning;
- /* the following appeared in 2.1.8, but were placed
- * between 'load_sbits' and 'load_sbit_image'. BOOOOH
- */
- TT_Find_SBit_Image_Func find_sbit_image; /* NULL if FT_OPTIMIZE_MEMORY */
- TT_Load_SBit_Metrics_Func load_sbit_metrics; /* NULL if FT_OPTIMIZE_MEMORY */
+ /* The following appeared in 2.1.8, but were placed between */
+ /* `load_sbits' and `load_sbit_image'. Both fields are NULL if */
+ /* FT_OPTIMIZE_MEMORY is used. */
+ TT_Find_SBit_Image_Func find_sbit_image;
+ TT_Load_SBit_Metrics_Func load_sbit_metrics;
+
+ /* new elements introduced after version 2.1.10 */
- /* since FreeType 2.2 */
/* load the font directory, i.e., the offset table and */
/* the table directory */
TT_Load_Table_Func load_font_dir;
diff --git a/include/freetype/internal/t1types.h b/include/freetype/internal/t1types.h
index d66d109..65d9ca9 100644
--- a/include/freetype/internal/t1types.h
+++ b/include/freetype/internal/t1types.h
@@ -200,14 +200,15 @@ FT_BEGIN_HEADER
const void* afm_data;
FT_CharMapRec charmaprecs[2];
FT_CharMap charmaps[2];
+
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
- PS_Unicodes unicode_map; /* apparently unused, keep for old internals */
+ PS_Unicodes unicode_map;
#endif
/* support for Multiple Masters fonts */
PS_Blend blend;
- /* since FT 2.1 - interface to PostScript hinter */
+ /* since version 2.1 - interface to PostScript hinter */
const void* pshinter;
} T1_FaceRec;
@@ -222,10 +223,10 @@ FT_BEGIN_HEADER
void* afm_data;
CID_Subrs subrs;
- /* since FT 2.1 - interface to PostScript hinter */
+ /* since version 2.1 - interface to PostScript hinter */
void* pshinter;
- /* since FT 2.1.8, but was originally after 'afm_data' */
+ /* since version 2.1.8, but was originally positioned after `afm_data' */
FT_Byte* binary_data; /* used if hex data has been converted */
FT_Stream cid_stream;
diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h
index 3e71b30..cc47a3d 100644
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -5,7 +5,7 @@
/* Basic SFNT/TrueType type definitions and interface (specification */
/* only). */
/* */
-/* Copyright 1996-2001, 2002, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -1383,16 +1383,17 @@ FT_BEGIN_HEADER
const char* postscript_name;
- /* since FreeType 2.1.8, but was originally placed after 'glyph_locations_stub' */
+ /* since version 2.1.8, but was originally placed after */
+ /* `glyph_locations_stub' */
FT_ULong glyf_len;
- /* since FreeType 2.1.8, but was originally placed before 'extra' */
+ /* since version 2.1.8, but was originally placed before `extra' */
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
FT_Bool doblend;
GX_Blend blend;
#endif
- /* since FreeType 2.2 */
+ /* since version 2.2 */
#ifdef FT_OPTIMIZE_MEMORY
FT_Byte* horz_metrics;
@@ -1514,7 +1515,7 @@ FT_BEGIN_HEADER
/* for possible extensibility in other formats */
void* other;
- /* since FT 2.1.8 */
+ /* since version 2.1.8 */
FT_Int top_bearing;
FT_Int vadvance;
FT_Vector pp3;
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index 4af1849..ba3d089 100644
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -4,7 +4,7 @@
/* */
/* Arithmetic computations (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/base/ftdbgmem.c b/src/base/ftdbgmem.c
index 77d50f7..632d5df 100644
--- a/src/base/ftdbgmem.c
+++ b/src/base/ftdbgmem.c
@@ -892,10 +892,10 @@
FT_BASE_DEF( FT_Pointer )
ft_mem_alloc_debug( FT_Memory memory,
- FT_Long size,
- FT_Error *p_error,
- const char* file_name,
- FT_Long line_no )
+ FT_Long size,
+ FT_Error *p_error,
+ const char* file_name,
+ FT_Long line_no )
{
FT_MemTable table = (FT_MemTable)memory->user;
@@ -912,12 +912,12 @@
FT_BASE_DEF( FT_Pointer )
ft_mem_realloc_debug( FT_Memory memory,
- FT_Long current,
- FT_Long size,
- void* block,
- FT_Error *p_error,
- const char* file_name,
- FT_Long line_no )
+ FT_Long current,
+ FT_Long size,
+ void* block,
+ FT_Error *p_error,
+ const char* file_name,
+ FT_Long line_no )
{
FT_MemTable table = (FT_MemTable)memory->user;
@@ -934,10 +934,10 @@
FT_BASE_DEF( FT_Pointer )
ft_mem_qalloc_debug( FT_Memory memory,
- FT_Long size,
- FT_Error *p_error,
- const char* file_name,
- FT_Long line_no )
+ FT_Long size,
+ FT_Error *p_error,
+ const char* file_name,
+ FT_Long line_no )
{
FT_MemTable table = (FT_MemTable)memory->user;
@@ -954,12 +954,12 @@
FT_BASE_DEF( FT_Pointer )
ft_mem_qrealloc_debug( FT_Memory memory,
- FT_Long current,
- FT_Long size,
- void* block,
- FT_Error *p_error,
- const char* file_name,
- FT_Long line_no )
+ FT_Long current,
+ FT_Long size,
+ void* block,
+ FT_Error *p_error,
+ const char* file_name,
+ FT_Long line_no )
{
FT_MemTable table = (FT_MemTable)memory->user;
@@ -976,9 +976,9 @@
FT_BASE_DEF( void )
ft_mem_free_debug( FT_Memory memory,
- const void *P,
- const char* file_name,
- FT_Long line_no )
+ const void *P,
+ const char* file_name,
+ FT_Long line_no )
{
FT_MemTable table = (FT_MemTable)memory->user;
@@ -998,10 +998,10 @@
FT_BASE_DEF( FT_Error )
ft_mem_alloc_debug( FT_Memory memory,
- FT_Long size,
- void* *P,
- const char* file_name,
- FT_Long line_no )
+ FT_Long size,
+ void* *P,
+ const char* file_name,
+ FT_Long line_no )
{
FT_MemTable table = (FT_MemTable)memory->user;
@@ -1018,11 +1018,11 @@
FT_BASE_DEF( FT_Error )
ft_mem_realloc_debug( FT_Memory memory,
- FT_Long current,
- FT_Long size,
- void* *P,
- const char* file_name,
- FT_Long line_no )
+ FT_Long current,
+ FT_Long size,
+ void* *P,
+ const char* file_name,
+ FT_Long line_no )
{
FT_MemTable table = (FT_MemTable)memory->user;
@@ -1039,10 +1039,10 @@
FT_BASE_DEF( FT_Error )
ft_mem_qalloc_debug( FT_Memory memory,
- FT_Long size,
- void* *P,
- const char* file_name,
- FT_Long line_no )
+ FT_Long size,
+ void* *P,
+ const char* file_name,
+ FT_Long line_no )
{
FT_MemTable table = (FT_MemTable)memory->user;
@@ -1059,11 +1059,11 @@
FT_BASE_DEF( FT_Error )
ft_mem_qrealloc_debug( FT_Memory memory,
- FT_Long current,
- FT_Long size,
- void* *P,
- const char* file_name,
- FT_Long line_no )
+ FT_Long current,
+ FT_Long size,
+ void* *P,
+ const char* file_name,
+ FT_Long line_no )
{
FT_MemTable table = (FT_MemTable)memory->user;
@@ -1080,9 +1080,9 @@
FT_BASE_DEF( void )
ft_mem_free_debug( FT_Memory memory,
- FT_Pointer block,
- const char* file_name,
- FT_Long line_no )
+ FT_Pointer block,
+ const char* file_name,
+ FT_Long line_no )
{
FT_MemTable table = (FT_MemTable)memory->user;
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index a6a62d6..e7b6666 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -3674,7 +3674,9 @@
library->debug_hooks[hook_index] = debug_hook;
}
+
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
+
FT_BASE_DEF( FT_Error )
ft_stub_set_char_sizes( FT_Size size,
FT_F26Dot6 width,
@@ -3685,6 +3687,7 @@
FT_Size_RequestRec req;
FT_Driver driver = size->face->driver;
+
if ( driver->clazz->request_size )
{
req.type = FT_SIZE_REQUEST_TYPE_NOMINAL;
@@ -3705,30 +3708,34 @@
return driver->clazz->request_size( size, &req );
}
+
return 0;
}
FT_BASE_DEF( FT_Error )
- ft_stub_set_pixel_sizes( FT_Size size,
- FT_UInt width,
- FT_UInt height )
+ ft_stub_set_pixel_sizes( FT_Size size,
+ FT_UInt width,
+ FT_UInt height )
{
FT_Size_RequestRec req;
FT_Driver driver = size->face->driver;
+
if ( driver->clazz->request_size )
{
req.type = FT_SIZE_REQUEST_TYPE_NOMINAL;
- req.width = width << 6;
+ req.width = width << 6;
req.height = height << 6;
req.horiResolution = 0;
req.vertResolution = 0;
return driver->clazz->request_size( size, &req );
}
+
return 0;
}
+
#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
/* END */
diff --git a/src/base/ftsystem.c b/src/base/ftsystem.c
index 86b5df6..b7fb5f9 100644
--- a/src/base/ftsystem.c
+++ b/src/base/ftsystem.c
@@ -4,7 +4,7 @@
/* */
/* ANSI-specific FreeType low-level system interface (body). */
/* */
-/* Copyright 1996-2001, 2002 by */
+/* Copyright 1996-2001, 2002, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -46,7 +46,7 @@
/* */
/* It is not necessary to do any error checking for the */
/* allocation-related functions. This will be done by the higher level */
- /* routines like ft_mem_alloc() or ft_mem_realloc(). */
+ /* routines like ft_mem_alloc() or ft_mem_realloc(). */
/* */
/*************************************************************************/
diff --git a/src/base/ftutil.c b/src/base/ftutil.c
index ef59353..efc2314 100644
--- a/src/base/ftutil.c
+++ b/src/base/ftutil.c
@@ -51,8 +51,8 @@
FT_BASE_DEF( FT_Pointer )
ft_mem_alloc( FT_Memory memory,
- FT_Long size,
- FT_Error *p_error )
+ FT_Long size,
+ FT_Error *p_error )
{
FT_Error error = FT_Err_Ok;
FT_Pointer block = NULL;
@@ -74,8 +74,8 @@
FT_BASE_DEF( FT_Pointer )
ft_mem_qalloc( FT_Memory memory,
- FT_Long size,
- FT_Error *p_error )
+ FT_Long size,
+ FT_Error *p_error )
{
FT_Error error = FT_Err_Ok;
FT_Pointer block = NULL;
@@ -95,10 +95,10 @@
FT_BASE_DEF( FT_Pointer )
ft_mem_realloc( FT_Memory memory,
- FT_Long current,
- FT_Long size,
- void* block,
- FT_Error *p_error )
+ FT_Long current,
+ FT_Long size,
+ void* block,
+ FT_Error *p_error )
{
FT_Error error = FT_Err_Ok;
@@ -137,10 +137,10 @@
FT_BASE_DEF( FT_Pointer )
ft_mem_qrealloc( FT_Memory memory,
- FT_Long current,
- FT_Long size,
- void* block,
- FT_Error *p_error )
+ FT_Long current,
+ FT_Long size,
+ void* block,
+ FT_Error *p_error )
{
FT_Error error = FT_Err_Ok;
@@ -174,7 +174,7 @@
FT_BASE_DEF( void )
ft_mem_free( FT_Memory memory,
- const void *P )
+ const void *P )
{
if ( P )
memory->free( memory, (void*)P );
@@ -188,8 +188,8 @@
FT_BASE_DEF( FT_Error )
ft_mem_alloc( FT_Memory memory,
- FT_Long size,
- void* *P )
+ FT_Long size,
+ void* *P )
{
FT_ASSERT( P != 0 );
@@ -221,8 +221,8 @@
FT_BASE_DEF( FT_Error )
ft_mem_qalloc( FT_Memory memory,
- FT_Long size,
- void* *P )
+ FT_Long size,
+ void* *P )
{
FT_ASSERT( P != 0 );
@@ -253,9 +253,9 @@
FT_BASE_DEF( FT_Error )
ft_mem_realloc( FT_Memory memory,
- FT_Long current,
- FT_Long size,
- void** P )
+ FT_Long current,
+ FT_Long size,
+ void** P )
{
void* Q;
@@ -295,9 +295,9 @@
FT_BASE_DEF( FT_Error )
ft_mem_qrealloc( FT_Memory memory,
- FT_Long current,
- FT_Long size,
- void** P )
+ FT_Long current,
+ FT_Long size,
+ void** P )
{
void* Q;
@@ -334,7 +334,7 @@
FT_BASE_DEF( void )
ft_mem_free( FT_Memory memory,
- void** P )
+ void** P )
{
FT_TRACE7(( "ft_mem_free:" ));
FT_TRACE7(( " Freeing block 0x%08p, ref 0x%08p\n",
@@ -561,6 +561,7 @@
return value;
}
+
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
FT_BASE_DEF( FT_Error )
@@ -570,10 +571,12 @@
{
FT_Error error;
+
(void)FT_ALLOC( *P, size );
return error;
}
+
FT_BASE_DEF( FT_Error )
FT_QAlloc( FT_Memory memory,
FT_Long size,
@@ -581,10 +584,12 @@
{
FT_Error error;
+
(void)FT_QALLOC( *p, size );
return error;
}
+
FT_BASE_DEF( FT_Error )
FT_Realloc( FT_Memory memory,
FT_Long current,
@@ -593,6 +598,7 @@
{
FT_Error error;
+
(void)FT_REALLOC( *P, current, size );
return error;
}
@@ -606,10 +612,12 @@
{
FT_Error error;
+
(void)FT_QREALLOC( *p, current, size );
return error;
}
+
FT_BASE_DEF( void )
FT_Free( FT_Memory memory,
void* *P )
diff --git a/src/cache/ftccback.h b/src/cache/ftccback.h
index b0aa3e9..5d7e8bd 100644
--- a/src/cache/ftccback.h
+++ b/src/cache/ftccback.h
@@ -4,7 +4,7 @@
/* */
/* Callback functions of the caching sub-system (specification only). */
/* */
-/* Copyright 2004, 2005 by */
+/* Copyright 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c
index 16b4158..fe4fa02 100644
--- a/src/cache/ftcmanag.c
+++ b/src/cache/ftcmanag.c
@@ -4,7 +4,7 @@
/* */
/* FreeType Cache Manager (body). */
/* */
-/* Copyright 2000-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -677,6 +677,7 @@
node->ref_count--;
}
+
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
FT_EXPORT_DEF( FT_Error )
@@ -698,6 +699,7 @@
FT_Error error;
FT_Size size;
+
scaler.face_id = font->face_id;
scaler.width = font->pix_width;
scaler.height = font->pix_height;
@@ -716,9 +718,11 @@
*aface = size->face;
*asize = size;
}
- return error;
+
+ return error;
}
#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
+
/* END */
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index 8895853..6a1658d 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -418,7 +418,7 @@
FT_CALLBACK_DEF( void )
- tt_face_free_hdmx_stub( TT_Face face )
+ tt_face_free_hdmx_stub( TT_Face face )
{
FT_UNUSED( face );
}
@@ -458,9 +458,9 @@
FT_CALLBACK_DEF( FT_Error )
- tt_face_load_charmap_stub( TT_Face face,
- void* cmap,
- FT_Stream input )
+ tt_face_load_charmap_stub( TT_Face face,
+ void* cmap,
+ FT_Stream input )
{
FT_UNUSED( face );
FT_UNUSED( cmap );
@@ -471,8 +471,8 @@
FT_CALLBACK_DEF( FT_Error )
- tt_face_free_charmap_stub( TT_Face face,
- void* cmap )
+ tt_face_free_charmap_stub( TT_Face face,
+ void* cmap )
{
FT_UNUSED( face );
FT_UNUSED( cmap );
@@ -482,6 +482,7 @@
#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
+
static
const SFNT_Interface sfnt_interface =
{
@@ -532,9 +533,9 @@
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
tt_face_load_sbit_image,
-#else /* !TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
+#else
0,
-#endif /* !TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
+#endif
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
tt_face_free_sbit_stub,
@@ -544,29 +545,30 @@
/* see `ttpost.h' */
tt_face_get_ps_name,
tt_face_free_ps_names,
-#else /* TT_CONFIG_OPTION_POSTSCRIPT_NAMES */
+#else
0,
0,
-#endif /* TT_CONFIG_OPTION_POSTSCRIPT_NAMES */
+#endif
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
tt_face_load_charmap_stub,
tt_face_free_charmap_stub,
#endif
- /* since FT 2.1.8 */
+ /* since version 2.1.8 */
tt_face_get_kerning,
-# ifndef FT_OPTIMIZE_MEMORY
+#ifndef FT_OPTIMIZE_MEMORY
tt_find_sbit_image,
tt_load_sbit_metrics,
-# else
+#else
0,
0,
-# endif
+#endif
+
+ /* since version 2.2 */
- /* since FT 2.2 */
tt_face_load_font_dir,
tt_face_load_hmtx,
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index 6f08794..4c1a340 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -4,7 +4,7 @@
/* */
/* TrueType character mapping table (cmap) support (body). */
/* */
-/* Copyright 2002, 2003, 2004, 2005 by */
+/* Copyright 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/sfnt/ttmtx.c b/src/sfnt/ttmtx.c
index 141574c..bb89cd3 100644
--- a/src/sfnt/ttmtx.c
+++ b/src/sfnt/ttmtx.c
@@ -292,7 +292,7 @@
goto Fail;
FT_TRACE3(( "Ascender: %5d\n", header->Ascender ));
- FT_TRACE3(( "Descenter: %5d\n", header->Descender ));
+ FT_TRACE3(( "Descender: %5d\n", header->Descender ));
FT_TRACE3(( "number_Of_Metrics: %5u\n", header->number_Of_HMetrics ));
header->long_metrics = NULL;
@@ -404,7 +404,8 @@
FT_UShort k = header->number_Of_HMetrics;
- if ( k == 0 || !header->long_metrics ||
+ if ( k == 0 ||
+ !header->long_metrics ||
gindex >= (FT_UInt)face->max_profile.numGlyphs )
{
*abearing = *aadvance = 0;
diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c
index 573b1f0..39f9916 100644
--- a/src/sfnt/ttpost.c
+++ b/src/sfnt/ttpost.c
@@ -5,7 +5,7 @@
/* Postcript name table processing for TrueType and OpenType fonts */
/* (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003 by */
+/* Copyright 1996-2001, 2002, 2003, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index df252aa..bb08a5a 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -4,7 +4,7 @@
/* */
/* TrueType bytecode interpreter (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h
index d8be892..2b8dae1 100644
--- a/src/truetype/ttinterp.h
+++ b/src/truetype/ttinterp.h
@@ -4,7 +4,7 @@
/* */
/* TrueType bytecode interpreter (specification). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */