Commit a3b6c6c2906c04b73a80674b3f75c3e21e7f21c6
2000-05-31T06:55:12
Formatting, fixing and adding documentation.
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 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789
diff --git a/src/base/ftinit.c b/src/base/ftinit.c
index 1ec5420..65a363a 100644
--- a/src/base/ftinit.c
+++ b/src/base/ftinit.c
@@ -17,23 +17,19 @@
/*************************************************************************/
/* */
- /* The purpose of this file is to implement the three following */
+ /* The purpose of this file is to implement the following two */
/* functions: */
/* */
- /* FT_Default_Drivers: */
+ /* FT_Default_Drivers(): */
/* This function is used to add the set of default drivers to a */
- /* fresh new library object. The set is computed at compile time */
- /* from the Makefiles inclusions in Makefile.lib. See the document */
- /* `FreeType Internals' for more info. */
+ /* fresh new library object. The set is taken from the header file */
+ /* `freetype/config/ftmodule.h'. See the document `FreeType 2.0 */
+ /* Build System' for more information. */
/* */
- /* FT_Init_FreeType: */
+ /* FT_Init_FreeType(): */
/* This function creates a system object for the current platform, */
/* builds a library out of it, then calls FT_Default_Drivers(). */
/* */
- /* FT_Done_FreeType: */
- /* This function simply finalizes the library and the corresponding */
- /* system object. */
- /* */
/* Note that even if FT_Init_FreeType() uses the implementation of the */
/* system object defined at build time, client applications are still */
/* able to provide their own `ftsystem.c'. */
@@ -76,7 +72,7 @@ const FT_DriverInterface* ft_default_drivers[] =
/* <InOut> */
/* library :: A handle to a new library object. */
/* */
- FT_EXPORT_FUNC(void) FT_Default_Drivers( FT_Library library )
+ FT_EXPORT_FUNC( void ) FT_Default_Drivers( FT_Library library )
{
FT_Error error;
const FT_DriverInterface* *cur;
@@ -89,7 +85,7 @@ const FT_DriverInterface* ft_default_drivers[] =
/* notify errors, but don't stop */
if ( error )
{
- FT_ERROR(( "FT.Default_Drivers: Cannot install `%s', error = %x\n",
+ FT_ERROR(( "FT_Default_Drivers: Cannot install `%s', error = %x\n",
(*cur)->driver_name, error ));
}
cur++;
@@ -112,13 +108,13 @@ const FT_DriverInterface* ft_default_drivers[] =
/* <Return> */
/* FreeTyoe error code. 0 means success. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Init_FreeType( FT_Library* library )
+ FT_EXPORT_FUNC( FT_Error ) FT_Init_FreeType( FT_Library* library )
{
FT_Error error;
FT_Memory memory;
- /* First of all, allocate a new system object - -this function is part */
+ /* First of all, allocate a new system object -- this function is part */
/* of the system-specific component, i.e. `ftsystem.c'. */
memory = FT_New_Memory();
diff --git a/src/base/ftlist.c b/src/base/ftlist.c
index c4d0eb3..d6dd9c2 100644
--- a/src/base/ftlist.c
+++ b/src/base/ftlist.c
@@ -18,7 +18,7 @@
/*************************************************************************/
/* */
/* This file implements functions relative to list processing. Its */
- /* data structures are defined in `freetype.h'. */
+ /* data structures are defined in `freetype/internal/ftlist.h'. */
/* */
/*************************************************************************/
@@ -43,8 +43,8 @@
/* <Return> */
/* List node. NULL if it wasn't found. */
/* */
- BASE_FUNC(FT_ListNode) FT_List_Find( FT_List list,
- void* data )
+ BASE_FUNC( FT_ListNode ) FT_List_Find( FT_List list,
+ void* data )
{
FT_ListNode cur;
@@ -74,8 +74,8 @@
/* list :: A pointer to the parent list. */
/* node :: The node to append. */
/* */
- BASE_FUNC(void) FT_List_Add( FT_List list,
- FT_ListNode node )
+ BASE_FUNC( void ) FT_List_Add( FT_List list,
+ FT_ListNode node )
{
FT_ListNode before = list->tail;
@@ -104,8 +104,8 @@
/* list :: A pointer to parent list. */
/* node :: The node to insert. */
/* */
- BASE_FUNC(void) FT_List_Insert( FT_List list,
- FT_ListNode node )
+ BASE_FUNC( void ) FT_List_Insert( FT_List list,
+ FT_ListNode node )
{
FT_ListNode after = list->head;
@@ -137,8 +137,8 @@
/* <InOut> */
/* list :: A pointer to the parent list. */
/* */
- BASE_FUNC(void) FT_List_Remove( FT_List list,
- FT_ListNode node )
+ BASE_FUNC( void ) FT_List_Remove( FT_List list,
+ FT_ListNode node )
{
FT_ListNode before, after;
@@ -171,8 +171,8 @@
/* list :: A pointer to the parent list. */
/* node :: The node to move. */
/* */
- BASE_FUNC(void) FT_List_Up( FT_List list,
- FT_ListNode node )
+ BASE_FUNC( void ) FT_List_Up( FT_List list,
+ FT_ListNode node )
{
FT_ListNode before, after;
@@ -180,7 +180,7 @@
before = node->prev;
after = node->next;
- /* check wether we're already on top of the list */
+ /* check whether we are already on top of the list */
if ( !before )
return;
@@ -216,11 +216,11 @@
/* argument to the iterator. */
/* */
/* <Return> */
- /* The result (an error code) of the last iterator call. */
+ /* The result (a FreeType error code) of the last iterator call. */
/* */
- BASE_FUNC(FT_Error) FT_List_Iterate( FT_List list,
- FT_List_Iterator iterator,
- void* user )
+ BASE_FUNC( FT_Error ) FT_List_Iterate( FT_List list,
+ FT_List_Iterator iterator,
+ void* user )
{
FT_ListNode cur = list->head;
FT_Error error = FT_Err_Ok;
@@ -256,16 +256,15 @@
/* destroy :: A list destructor that will be applied to each element */
/* of the list. */
/* */
- /* memory :: The current memory object where destructions take */
- /* place. */
+ /* memory :: The current memory object which handles deallocation. */
/* */
/* user :: A user-supplied field which is passed as the last */
/* argument to the destructor. */
/* */
- BASE_FUNC(void) FT_List_Finalize( FT_List list,
- FT_List_Destructor destroy,
- FT_Memory memory,
- void* user )
+ BASE_FUNC( void ) FT_List_Finalize( FT_List list,
+ FT_List_Destructor destroy,
+ FT_Memory memory,
+ void* user )
{
FT_ListNode cur;
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index f9943bf..42b13d4 100644
--- a/src/base/ftmm.c
+++ b/src/base/ftmm.c
@@ -1,66 +1,97 @@
+/***************************************************************************/
+/* */
+/* ftmm.c */
+/* */
+/* Multiple Master font support (body). */
+/* */
+/* Copyright 1996-2000 by */
+/* David Turner, Robert Wilhelm, and Werner Lemberg. */
+/* */
+/* This file is part of the FreeType project, and may only be used */
+/* modified and distributed under the terms of the FreeType project */
+/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
+/* this file you indicate that you have read the license and */
+/* understand and accept it fully. */
+/* */
+/***************************************************************************/
+
+
#include <freetype/ftmm.h>
#include <freetype/internal/ftobjs.h>
- FT_EXPORT_FUNC(FT_Error) FT_Get_Multi_Master( FT_Face face,
- FT_Multi_Master* master )
+ FT_EXPORT_FUNC( FT_Error ) FT_Get_Multi_Master( FT_Face face,
+ FT_Multi_Master* master )
{
FT_Error error;
+
error = FT_Err_Invalid_Argument;
- if (face && FT_HAS_MULTIPLE_MASTERS(face))
+
+ if ( face && FT_HAS_MULTIPLE_MASTERS( face ) )
{
FT_Driver driver = face->driver;
FT_Get_MM_Func func;
- func = (FT_Get_MM_Func)driver->interface.get_interface(
- driver, "get_mm" );
- if (func)
- error = func(face,master);
+
+ func = (FT_Get_MM_Func)driver->interface.get_interface(
+ driver, "get_mm" );
+ if ( func )
+ error = func( face, master );
}
return error;
}
- FT_EXPORT_FUNC(FT_Error) FT_Set_MM_Design_Coordinates( FT_Face face,
- FT_UInt num_coords,
- FT_Long* coords )
+ FT_EXPORT_FUNC( FT_Error ) FT_Set_MM_Design_Coordinates(
+ FT_Face face,
+ FT_UInt num_coords,
+ FT_Long* coords )
{
FT_Error error;
+
error = FT_Err_Invalid_Argument;
- if (face && FT_HAS_MULTIPLE_MASTERS(face))
+
+ if ( face && FT_HAS_MULTIPLE_MASTERS( face ) )
{
FT_Driver driver = face->driver;
FT_Set_MM_Design_Func func;
+
func = (FT_Set_MM_Design_Func)driver->interface.get_interface(
driver, "set_mm_design" );
- if (func)
- error = func(face,num_coords,coords);
+ if ( func )
+ error = func( face, num_coords, coords );
}
return error;
}
- FT_EXPORT_FUNC(FT_Error) FT_Set_MM_Blend_Coordinates( FT_Face face,
- FT_UInt num_coords,
- FT_Fixed* coords )
+
+ FT_EXPORT_FUNC( FT_Error ) FT_Set_MM_Blend_Coordinates(
+ FT_Face face,
+ FT_UInt num_coords,
+ FT_Fixed* coords )
{
FT_Error error;
+
error = FT_Err_Invalid_Argument;
- if (face && FT_HAS_MULTIPLE_MASTERS(face))
+
+ if ( face && FT_HAS_MULTIPLE_MASTERS( face ) )
{
- FT_Driver driver = face->driver;
+ FT_Driver driver = face->driver;
FT_Set_MM_Blend_Func func;
func = (FT_Set_MM_Blend_Func)driver->interface.get_interface(
driver, "set_mm_blend" );
- if (func)
- error = func(face,num_coords,coords);
+ if ( func )
+ error = func( face, num_coords, coords );
}
return error;
}
+
+/* END */
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index e515562..cca71b8 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -2,7 +2,7 @@
/* */
/* ftobjs.c */
/* */
-/* The FreeType private base classes (base). */
+/* The FreeType private base classes (base). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg */
@@ -15,6 +15,7 @@
/* */
/***************************************************************************/
+
#include <freetype/internal/ftobjs.h>
#include <freetype/internal/ftlist.h>
#include <freetype/internal/ftdebug.h>
@@ -22,6 +23,7 @@
#include <freetype/tttables.h>
+
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@@ -54,8 +56,8 @@
/* zero-filled; this is a strong convention in many FreeType parts. */
/* */
/* <Input> */
- /* memory :: A handle to a given `memory object' where allocation */
- /* occurs. */
+ /* memory :: A handle to a given `memory object' which handles */
+ /* allocation. */
/* */
/* size :: The size in bytes of the block to allocate. */
/* */
@@ -66,9 +68,9 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- BASE_FUNC(FT_Error) FT_Alloc( FT_Memory memory,
- FT_Long size,
- void** P )
+ BASE_FUNC( FT_Error ) FT_Alloc( FT_Memory memory,
+ FT_Long size,
+ void** P )
{
FT_Assert( P != 0 );
@@ -77,7 +79,7 @@
*P = memory->alloc( memory, size );
if ( !*P )
{
- FT_ERROR(( "FT.Alloc:" ));
+ FT_ERROR(( "FT_Alloc:" ));
FT_ERROR(( " Out of memory? (%ld requested)\n",
size ));
@@ -106,10 +108,11 @@
/* from the heap, possibly changing `*P'. */
/* */
/* <Input> */
- /* memory :: A handle to a given `memory object' where allocation */
- /* occurs. */
+ /* memory :: A handle to a given `memory object' which handles */
+ /* reallocation. */
/* */
/* current :: The current block size in bytes. */
+ /* */
/* size :: The new block size in bytes. */
/* */
/* <InOut> */
@@ -130,10 +133,10 @@
/* */
/* (Some embedded systems do not have a working realloc function). */
/* */
- BASE_FUNC(FT_Error) FT_Realloc( FT_Memory memory,
- FT_Long current,
- FT_Long size,
- void** P )
+ BASE_FUNC( FT_Error ) FT_Realloc( FT_Memory memory,
+ FT_Long current,
+ FT_Long size,
+ void** P )
{
void* Q;
@@ -159,7 +162,7 @@
return FT_Err_Ok;
Fail:
- FT_ERROR(( "FT.Realloc:" ));
+ FT_ERROR(( "FT_Realloc:" ));
FT_ERROR(( " Failed (current %ld, requested %ld)\n",
current, size ));
return FT_Err_Out_Of_Memory;
@@ -175,8 +178,8 @@
/* Releases a given block of memory allocated through FT_Alloc(). */
/* */
/* <Input> */
- /* memory :: A handle to a given `memory object' where allocation */
- /* occurred. */
+ /* memory :: A handle to a given `memory object' which handles */
+ /* memory deallocation */
/* */
/* P :: This is the _address_ of a _pointer_ which points to the */
/* allocated block. It is always set to NULL on exit. */
@@ -189,12 +192,12 @@
/* This is a strong convention within all of FreeType and its */
/* drivers. */
/* */
- BASE_FUNC(void) FT_Free( FT_Memory memory,
- void** P )
+ BASE_FUNC( void ) FT_Free( FT_Memory memory,
+ void** P )
{
FT_TRACE2(( "FT_Free:" ));
FT_TRACE2(( " Freeing block 0x%08p, ref 0x%08p\n",
- P, (P ? *P : (void*)0) ));
+ P, P ? *P : (void*)0 ));
FT_Assert( P != 0 );
@@ -217,12 +220,13 @@
static
FT_Error ft_new_input_stream( FT_Library library,
FT_Open_Args* args,
- FT_Stream *astream )
+ FT_Stream* astream )
{
FT_Error error;
FT_Memory memory;
FT_Stream stream;
+
*astream = 0;
memory = library->memory;
if ( ALLOC( stream, sizeof ( *stream ) ) )
@@ -239,25 +243,24 @@
args->memory_size,
stream );
}
- else if (args->flags & ft_open_pathname)
+ else if ( args->flags & ft_open_pathname )
{
error = FT_New_Stream( args->pathname, stream );
stream->pathname.pointer = args->pathname;
}
- else if (args->flags & ft_open_stream && args->stream)
+ else if ( args->flags & ft_open_stream && args->stream )
{
*stream = *(args->stream);
stream->memory = memory;
}
else
- {
error = FT_Err_Invalid_Argument;
- }
if ( error )
FREE( stream );
*astream = stream;
+
Exit:
return error;
}
@@ -271,7 +274,10 @@
/* <Description> */
/* Closes and destroys a stream object. */
/* */
- FT_EXPORT_FUNC(void) FT_Done_Stream( FT_Stream stream )
+ /* <Input> */
+ /* stream :: The stream to be closed and destroyed. */
+ /* */
+ FT_EXPORT_FUNC( void ) FT_Done_Stream( FT_Stream stream )
{
if ( stream->close )
stream->close( stream );
@@ -284,6 +290,7 @@
FT_Stream stream = *astream;
FT_Memory memory = stream->memory;
+
if ( stream->close )
stream->close( stream );
@@ -291,6 +298,7 @@
*astream = 0;
}
+
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@@ -388,39 +396,43 @@
}
- /*************************************************************************
- *
- * <Function>
- * FT_Get_Raster
- *
- * <Description>
- * Return a pointer to the raster corresponding to a given glyph
- * format tag.
- *
- * <Input>
- * library :: handle to source library object
- * glyph_format :: glyph format tag
- *
- * <Output>
- * raster_funcs :: if this field is not 0, returns the raster's interface
- *
- * <Return>
- * a pointer to the corresponding raster object.
- *
- *************************************************************************/
-
- FT_EXPORT_FUNC(FT_Raster) FT_Get_Raster( FT_Library library,
- FT_Glyph_Format glyph_format,
- FT_Raster_Funcs *raster_funcs )
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Get_Raster */
+ /* */
+ /* <Description> */
+ /* Returns the raster interface corresponding to a given glyph format */
+ /* tag. */
+ /* */
+ /* <Input> */
+ /* library :: A handle to the source library object. */
+ /* */
+ /* glyph_format :: The glyph format tag. */
+ /* */
+ /* <Output> */
+ /* raster_funcs :: If this field is not 0, the raster's interface */
+ /* functions are returned. */
+ /* */
+ /* <Return> */
+ /* A pointer to the corresponding raster object. */
+ /* */
+ FT_EXPORT_FUNC( FT_Raster ) FT_Get_Raster(
+ FT_Library library,
+ FT_Glyph_Format glyph_format,
+ FT_Raster_Funcs* raster_funcs )
{
FT_Int n;
+
for ( n = 0; n < FT_MAX_GLYPH_FORMATS; n++ )
{
FT_Raster_Funcs* funcs = &library->raster_funcs[n];
- if (funcs->glyph_format == glyph_format)
+
+
+ if ( funcs->glyph_format == glyph_format )
{
- if (raster_funcs)
+ if ( raster_funcs )
*raster_funcs = *funcs;
return library->rasters[n];
}
@@ -428,34 +440,36 @@
return 0;
}
+
/*************************************************************************/
/* */
/* <Function> */
/* FT_Set_Raster */
/* */
/* <Description> */
- /* Register a given raster to the library. */
+ /* Registers a given raster to the library. */
/* */
/* <Input> */
/* library :: A handle to a target library object. */
- /* raster_funcs :: pointer to the raster's interface */
+ /* */
+ /* raster_funcs :: A pointer to the raster's interface functions. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
/* <Note> */
/* This function will do the following: */
/* */
- /* - a new raster object is created through raster_func.raster_new */
- /* if this fails, then the function returns */
+ /* - A new raster object is created through `raster_func.raster_new'. */
+ /* If this fails, the function returns. */
/* */
- /* - if a raster is already registered for the glyph format */
- /* specified in raster_funcs, it will be destroyed */
+ /* - If a raster is already registered for the glyph format */
+ /* specified in raster_funcs, it will be destroyed. */
/* */
- /* - the new raster is registered for the glyph format */
+ /* - The new raster is registered for the glyph format. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Set_Raster( FT_Library library,
- FT_Raster_Funcs* raster_funcs )
+ FT_EXPORT_FUNC( FT_Error ) FT_Set_Raster( FT_Library library,
+ FT_Raster_Funcs* raster_funcs )
{
FT_Glyph_Format glyph_format = raster_funcs->glyph_format;
FT_Raster_Funcs* funcs;
@@ -463,38 +477,41 @@
FT_Error error;
FT_Int n, index;
- if ( glyph_format == ft_glyph_format_none)
+
+ if ( glyph_format == ft_glyph_format_none )
return FT_Err_Invalid_Argument;
/* create a new raster object */
error = raster_funcs->raster_new( library->memory, &raster );
- if (error) goto Exit;
+ if ( error )
+ goto Exit;
raster_funcs->raster_reset( raster,
library->raster_pool,
library->raster_pool_size );
index = -1;
- for (n = 0; n < FT_MAX_GLYPH_FORMATS; n++)
+ for ( n = 0; n < FT_MAX_GLYPH_FORMATS; n++ )
{
FT_Raster_Funcs* funcs = library->raster_funcs + n;
- /* record the first vacant entry in "index" */
- if (index < 0 && funcs->glyph_format == ft_glyph_format_none)
+
+ /* record the first vacant entry in `index' */
+ if ( index < 0 && funcs->glyph_format == ft_glyph_format_none )
index = n;
/* compare this entry's glyph format with the one we need */
- if (funcs->glyph_format == glyph_format)
+ if ( funcs->glyph_format == glyph_format )
{
- /* a raster already exists for this glyph format, we will */
- /* destroy it before updating its entry in the table */
+ /* A raster already exists for this glyph format. We will */
+ /* destroy it before updating its entry in the table. */
funcs->raster_done( library->rasters[n] );
index = n;
break;
}
}
- if (index < 0)
+ if ( index < 0 )
{
/* the table is full and has no vacant entries */
error = FT_Err_Too_Many_Glyph_Formats;
@@ -513,6 +530,7 @@
goto Exit;
}
+
/*************************************************************************/
/* */
/* <Function> */
@@ -523,27 +541,32 @@
/* */
/* <Input> */
/* library :: A handle to a target library object. */
- /* raster_funcs :: pointer to the raster's interface */
+ /* */
+ /* raster_funcs :: A pointer to the raster's interface functions. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
- FT_EXPORT_DEF(FT_Error) FT_Unset_Raster( FT_Library library,
- FT_Raster_Funcs* raster_funcs )
+ FT_EXPORT_DEF( FT_Error ) FT_Unset_Raster(
+ FT_Library library,
+ FT_Raster_Funcs* raster_funcs )
{
FT_Glyph_Format glyph_format = raster_funcs->glyph_format;
FT_Error error;
FT_Int n;
+
error = FT_Err_Invalid_Argument;
- if ( glyph_format == ft_glyph_format_none)
+
+ if ( glyph_format == ft_glyph_format_none )
goto Exit;
- for (n = 0; n < FT_MAX_GLYPH_FORMATS; n++)
+ for ( n = 0; n < FT_MAX_GLYPH_FORMATS; n++ )
{
FT_Raster_Funcs* funcs = library->raster_funcs + n;
- if (funcs->glyph_format == glyph_format)
+
+ if ( funcs->glyph_format == glyph_format )
{
funcs->raster_done( library->rasters[n] );
library->rasters[n] = 0;
@@ -564,31 +587,38 @@
/* FT_Set_Raster_Mode */
/* */
/* <Description> */
- /* Set a raster-specific mode. */
+ /* Sets a raster-specific mode. */
/* */
- /* <Input> */
+ /* <InOut> */
/* library :: A handle to a target library object. */
- /* format :: the glyph format used to select the raster */
- /* mode :: the raster-specific mode descriptor */
- /* args :: the mode arguments */
+ /* */
+ /* <Input> */
+ /* format :: The glyph format used to select the raster. */
+ /* */
+ /* mode :: The raster-specific mode descriptor. */
+ /* */
+ /* args :: The mode arguments. */
+ /* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Set_Raster_Mode( FT_Library library,
- FT_Glyph_Format format,
- unsigned long mode,
- void* args )
+ FT_EXPORT_FUNC( FT_Error ) FT_Set_Raster_Mode( FT_Library library,
+ FT_Glyph_Format format,
+ unsigned long mode,
+ void* args )
{
FT_Raster_Funcs funcs;
FT_Raster raster;
+
raster = FT_Get_Raster( library, format, &funcs );
- if (raster && funcs.raster_set_mode )
+ if ( raster && funcs.raster_set_mode )
return funcs.raster_set_mode( raster, mode, args );
else
return FT_Err_Invalid_Argument;
}
+
/*************************************************************************/
/* */
/* <Function> */
@@ -600,20 +630,23 @@
/* */
/* <Input> */
/* library :: A handle to the library object. */
+ /* */
/* hook_index :: The index of the debug hook. You should use the */
/* values defined in ftobjs.h, e.g. */
/* FT_DEBUG_HOOK_TRUETYPE */
+ /* */
/* debug_hook :: The function used to debug the interpreter. */
/* */
/* <Note> */
/* Currently, four debug hook slots are available, but only two (for */
/* the TrueType and the Type 1 interpreter) are defined. */
/* */
- FT_EXPORT_FUNC(void) FT_Set_Debug_Hook( FT_Library library,
- FT_UInt hook_index,
- FT_DebugHook_Func debug_hook )
+ FT_EXPORT_FUNC( void ) FT_Set_Debug_Hook( FT_Library library,
+ FT_UInt hook_index,
+ FT_DebugHook_Func debug_hook )
{
- if ( hook_index < ( sizeof ( library->debug_hooks ) / sizeof ( void* ) ) )
+ if ( hook_index <
+ ( sizeof ( library->debug_hooks ) / sizeof ( void* ) ) )
library->debug_hooks[hook_index] = debug_hook;
}
@@ -637,12 +670,13 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_New_Library( FT_Memory memory,
- FT_Library* alibrary )
+ FT_EXPORT_FUNC( FT_Error ) FT_New_Library( FT_Memory memory,
+ FT_Library* alibrary )
{
FT_Library library = 0;
FT_Error error;
+
/* first of all, allocate the library object */
if ( ALLOC( library, sizeof ( *library ) ) )
return error;
@@ -654,15 +688,15 @@
if ( ALLOC( library->raster_pool, FT_RENDER_POOL_SIZE ) )
goto Fail;
- /* now register the default raster for the `outline' glyph image format */
- /* for now, ignore the error... */
+ /* now register the default raster for the `outline' glyph image */
+ /* format for now, ignore the error... */
error = FT_Set_Raster( library, &ft_default_raster );
-
/* That's ok now */
*alibrary = library;
return FT_Err_Ok;
+
Fail:
FREE( library );
return error;
@@ -679,12 +713,12 @@
/* discards all resource objects. */
/* */
/* <Input> */
- /* library :: A handle to the target library */
+ /* library :: A handle to the target library. */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Done_Library( FT_Library library )
+ FT_EXPORT_FUNC( FT_Error ) FT_Done_Library( FT_Library library )
{
FT_Memory memory;
FT_Int n;
@@ -717,8 +751,8 @@
library->raster_pool_size = 0;
{
- FT_Raster_Funcs* cur = library->raster_funcs;
- FT_Raster_Funcs* limit = cur + FT_MAX_GLYPH_FORMATS;
+ FT_Raster_Funcs* cur = library->raster_funcs;
+ FT_Raster_Funcs* limit = cur + FT_MAX_GLYPH_FORMATS;
FT_Raster* raster = library->rasters;
for ( ; cur < limit; cur++, raster++ )
@@ -761,8 +795,9 @@
/* This function doesn't check whether the driver is already */
/* installed! */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Add_Driver( FT_Library library,
- const FT_DriverInterface* driver_interface )
+ FT_EXPORT_FUNC( FT_Error ) FT_Add_Driver(
+ FT_Library library,
+ const FT_DriverInterface* driver_interface )
{
FT_Error error;
FT_Driver driver;
@@ -822,7 +857,7 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Remove_Driver( FT_Driver driver )
+ FT_EXPORT_FUNC( FT_Error ) FT_Remove_Driver( FT_Driver driver )
{
FT_Library library;
FT_Memory memory;
@@ -885,8 +920,8 @@
/* <Return> */
/* A handle to the driver object, 0 otherwise. */
/* */
- FT_EXPORT_FUNC(FT_Driver) FT_Get_Driver( FT_Library library,
- char* driver_name )
+ FT_EXPORT_FUNC( FT_Driver ) FT_Get_Driver( FT_Library library,
+ char* driver_name )
{
FT_Driver *cur, *limit;
@@ -938,7 +973,11 @@
face->memory = memory;
face->stream = stream;
- error = interface->init_face( stream, face, face_index, num_params, params );
+ error = interface->init_face( stream,
+ face,
+ face_index,
+ num_params,
+ params );
if ( error )
goto Fail;
@@ -956,7 +995,6 @@
}
-
/*************************************************************************/
/* */
/* <Function> */
@@ -971,10 +1009,11 @@
/* */
/* <Input> */
/* pathname :: A path to the font file. */
+ /* */
/* face_index :: The index of the face within the resource. The */
/* first face has index 0. */
/* <Output> */
- /* face :: A handle to a new face object. */
+ /* aface :: A handle to a new face object. */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */
@@ -994,15 +1033,17 @@
/* `*face'. Its return value should be 0 if the resource is */
/* recognized, or non-zero if not. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_New_Face( FT_Library library,
- const char* pathname,
- FT_Long face_index,
- FT_Face* aface )
+ FT_EXPORT_FUNC( FT_Error ) FT_New_Face( FT_Library library,
+ const char* pathname,
+ FT_Long face_index,
+ FT_Face* aface )
{
FT_Open_Args args;
+
args.flags = ft_open_pathname;
args.pathname = (char*)pathname;
+
return FT_Open_Face( library, &args, face_index, aface );
}
@@ -1021,7 +1062,9 @@
/* */
/* <Input> */
/* file_base :: A pointer to the beginning of the font data. */
+ /* */
/* file_size :: The size of the memory chunk used by the font data. */
+ /* */
/* face_index :: The index of the face within the resource. The */
/* first face has index 0. */
/* <Output> */
@@ -1045,17 +1088,19 @@
/* `*face'. Its return value should be 0 if the resource is */
/* recognized, or non-zero if not. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_New_Memory_Face( FT_Library library,
- void* file_base,
- FT_Long file_size,
- FT_Long face_index,
- FT_Face* face )
+ FT_EXPORT_FUNC( FT_Error ) FT_New_Memory_Face( FT_Library library,
+ void* file_base,
+ FT_Long file_size,
+ FT_Long face_index,
+ FT_Face* face )
{
FT_Open_Args args;
+
args.flags = ft_open_memory;
args.memory_base = file_base;
args.memory_size = file_size;
+
return FT_Open_Face( library, &args, face_index, face );
}
@@ -1076,10 +1121,11 @@
/* <Input> */
/* args :: A pointer to an `FT_Open_Args' structure which must */
/* be filled by the caller. */
+ /* */
/* face_index :: The index of the face within the resource. The */
/* first face has index 0. */
/* <Output> */
- /* face :: A handle to a new face object. */
+ /* aface :: A handle to a new face object. */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */
@@ -1099,10 +1145,10 @@
/* `*face'. Its return value should be 0 if the resource is */
/* recognized, or non-zero if not. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Open_Face( FT_Library library,
- FT_Open_Args* args,
- FT_Long face_index,
- FT_Face* aface )
+ FT_EXPORT_FUNC( FT_Error ) FT_Open_Face( FT_Library library,
+ FT_Open_Args* args,
+ FT_Long face_index,
+ FT_Face* aface )
{
FT_Error error;
FT_Driver driver;
@@ -1119,11 +1165,12 @@
/* create input stream */
error = ft_new_input_stream( library, args, &stream );
- if ( error ) goto Exit;
+ if ( error )
+ goto Exit;
memory = library->memory;
- /* if the font driver is specified in the `args' structure, use */
+ /* If the font driver is specified in the `args' structure, use */
/* it. Otherwise, we'll scan the list of registered drivers. */
if ( args->flags & ft_open_driver && args->driver )
{
@@ -1134,6 +1181,7 @@
FT_Int num_params = 0;
FT_Parameter* params = 0;
+
if ( args->flags & ft_open_params )
{
num_params = args->num_params;
@@ -1165,6 +1213,7 @@
FT_Int num_params = 0;
FT_Parameter* params = 0;
+
if ( args->flags & ft_open_params )
{
num_params = args->num_params;
@@ -1194,8 +1243,8 @@
goto Fail;
node->data = face;
- /* don't assume driver is the same as face->driver, so use
- face->driver instead. (JvR 3/5/2000) */
+ /* don't assume driver is the same as face->driver, so use */
+ /* face->driver instead. */
FT_List_Add( &face->driver->faces_list, node );
/* now allocate a glyph slot object for the face */
@@ -1209,7 +1258,7 @@
goto Fail;
}
- /* finally allocate a size object for the face */
+ /* finally, allocate a size object for the face */
{
FT_Size size;
@@ -1220,7 +1269,7 @@
goto Fail;
}
- /* initialize transform for convenience functions */
+ /* initialize transformation for convenience functions */
face->transform_matrix.xx = 0x10000L;
face->transform_matrix.xy = 0;
face->transform_matrix.yx = 0;
@@ -1270,16 +1319,18 @@
/* depends on the font format (and thus the font driver). */
/* */
/* Client applications are expected to know what they are doing */
- /* when invoking this function. Most drivers simply do not implement */
+ /* when invoking this function. Most drivers simply do not implement */
/* file attachments. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Attach_File( FT_Face face,
- const char* filepathname )
+ FT_EXPORT_FUNC( FT_Error ) FT_Attach_File( FT_Face face,
+ const char* filepathname )
{
FT_Open_Args open;
+
open.flags = ft_open_pathname;
open.pathname = (char*)filepathname;
+
return FT_Attach_Stream( face, &open );
}
@@ -1290,27 +1341,28 @@
/* FT_Attach_Stream */
/* */
/* <Description> */
- /* This function is similar to FT_Attach_File with the exception */
+ /* This function is similar to FT_Attach_File() with the exception */
/* that it reads the attachment from an arbitrary stream. */
/* */
/* <Input> */
- /* face :: target face object */
+ /* face :: The target face object. */
/* */
- /* args :: a pointer to an FT_Open_Args structure used to describe */
- /* the input stream to FreeType */
+ /* parameters :: A pointer to an FT_Open_Args structure used to */
+ /* describe the input stream to FreeType. */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
- /* The meaning of the "attach" (i.e. what really happens when the */
- /* new file is read) is not fixed by FreeType itself. It really */
+ /* <Note> */
+ /* The meaning of the `attach' (i.e. what really happens when the */
+ /* new file is read) is not fixed by FreeType itself. It really */
/* depends on the font format (and thus the font driver). */
/* */
- /* Client applications are expected to know what they're doing */
- /* when invoking this function. Most drivers simply do not implement */
- /* file attachments.. */
+ /* Client applications are expected to know what they are doing */
+ /* when invoking this function. Most drivers simply do not implement */
+ /* file attachments. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Attach_Stream( FT_Face face,
- FT_Open_Args* parameters )
+ FT_EXPORT_FUNC( FT_Error ) FT_Attach_Stream( FT_Face face,
+ FT_Open_Args* parameters )
{
FT_Stream stream;
FT_Error error;
@@ -1318,24 +1370,28 @@
FTDriver_getInterface get_interface;
+
if ( !face || !face->driver )
return FT_Err_Invalid_Handle;
driver = face->driver;
- error = ft_new_input_stream( driver->library, parameters, &stream );
- if (error) goto Exit;
+ error = ft_new_input_stream( driver->library, parameters, &stream );
+ if ( error )
+ goto Exit;
/* we implement FT_Attach_Stream in each driver through the */
- /* "attach_file" interface.. */
+ /* `attach_file' interface */
+
error = FT_Err_Unimplemented_Feature;
get_interface = driver->interface.get_interface;
- if (get_interface)
+ if ( get_interface )
{
FT_Attach_Reader reader;
+
reader = (FT_Attach_Reader)(get_interface( driver, "attach_file" ));
- if (reader)
+ if ( reader )
error = reader( face, stream );
}
@@ -1347,7 +1403,6 @@
}
-
/*************************************************************************/
/* */
/* <Function> */
@@ -1361,9 +1416,9 @@
/* face :: A handle to a target face object. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Done_Face( FT_Face face )
+ FT_EXPORT_FUNC( FT_Error ) FT_Done_Face( FT_Face face )
{
FT_Error error;
FT_Driver driver;
@@ -1372,7 +1427,7 @@
FT_ListNode node;
- if (!face || !face->driver )
+ if ( !face || !face->driver )
return FT_Err_Invalid_Face_Handle;
driver = face->driver;
@@ -1410,13 +1465,13 @@
/* face :: A handle to a parent face object. */
/* */
/* <Output> */
- /* size :: A handle to a new size object. */
+ /* asize :: A handle to a new size object. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_New_Size( FT_Face face,
- FT_Size* asize )
+ FT_EXPORT_FUNC( FT_Error ) FT_New_Size( FT_Face face,
+ FT_Size* asize )
{
FT_Error error;
FT_Memory memory;
@@ -1475,12 +1530,12 @@
/* Discards a given size object. */
/* */
/* <Input> */
- /* size :: A handle to a target size object */
+ /* size :: A handle to a target size object. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Done_Size( FT_Size size )
+ FT_EXPORT_FUNC( FT_Error ) FT_Done_Size( FT_Size size )
{
FT_Error error;
FT_Driver driver;
@@ -1506,10 +1561,10 @@
FT_List_Remove( &face->sizes_list, node );
FREE( node );
- if (face->size == size)
+ if ( face->size == size )
{
face->size = 0;
- if (face->sizes_list.head)
+ if ( face->sizes_list.head )
face->size = (FT_Size)(face->sizes_list.head->data);
}
@@ -1528,26 +1583,39 @@
/* FT_Set_Char_Size */
/* */
/* <Description> */
- /* Sets the character dimensions of a given size object. The */
- /* `char_size' value is used for the width and height, expressed in */
- /* 26.6 fractional points. 1 point = 1/72 inch. */
+ /* Sets the character dimensions of a given face object. The */
+ /* `char_width' and `char_height' values are used for the width and */
+ /* height, respectively, expressed in 26.6 fractional points. */
+ /* */
+ /* If the horizontal or vertical resolution values are zero, a */
+ /* default value of 72dpi is used. Similarly, if one of the */
+ /* character dimensions is zero, its value is set equal to the other. */
+ /* */
+ /* <InOut> */
+ /* size :: A handle to a target size object. */
/* */
/* <Input> */
- /* size :: A handle to a target size object. */
- /* char_size :: The character size, in 26.6 fractional points. */
+ /* char_width :: The character width, in 26.6 fractional points. */
+ /* */
+ /* char_height :: The character height, in 26.6 fractional */
+ /* points. */
+ /* */
+ /* horz_resolution :: The horizontal resolution. */
+ /* */
+ /* vert_resolution :: The vertical resolution. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
/* <Note> */
/* When dealing with fixed-size faces (i.e., non-scalable formats), */
/* use the function FT_Set_Pixel_Sizes(). */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Set_Char_Size( FT_Face face,
- FT_F26Dot6 char_width,
- FT_F26Dot6 char_height,
- FT_UInt horz_resolution,
- FT_UInt vert_resolution )
+ FT_EXPORT_FUNC( FT_Error ) FT_Set_Char_Size( FT_Face face,
+ FT_F26Dot6 char_width,
+ FT_F26Dot6 char_height,
+ FT_UInt horz_resolution,
+ FT_UInt vert_resolution )
{
FT_Error error;
FT_Driver driver;
@@ -1556,39 +1624,39 @@
FT_Size_Metrics* metrics = &face->size->metrics;
FT_Long dim_x, dim_y;
- if ( !face || !face->size || !face->driver)
+
+ if ( !face || !face->size || !face->driver )
return FT_Err_Invalid_Face_Handle;
- if (!char_width)
+ if ( !char_width )
char_width = char_height;
-
- else if (!char_height)
+ else if ( !char_height )
char_height = char_width;
- if (!horz_resolution)
+ if ( !horz_resolution )
horz_resolution = 72;
-
- if (!vert_resolution)
+ if ( !vert_resolution )
vert_resolution = 72;
driver = face->driver;
interface = &driver->interface;
memory = driver->memory;
- /* default processing - this can be overriden by the driver */
- if ( char_width < 1*64 ) char_width = 1*64;
- if ( char_height < 1*64 ) char_height = 1*64;
+ /* default processing -- this can be overridden by the driver */
+ if ( char_width < 1 * 64 ) char_width = 1 * 64;
+ if ( char_height < 1 * 64 ) char_height = 1 * 64;
/* Compute pixel sizes in 26.6 units */
- dim_x = (((char_width * horz_resolution) / 72) + 32) & -64;
- dim_y = (((char_height * vert_resolution) / 72) + 32) & -64;
+ dim_x = ( ( ( char_width * horz_resolution ) / 72 ) + 32 ) & -64;
+ dim_y = ( ( ( char_height * vert_resolution ) / 72 ) + 32 ) & -64;
- metrics->x_ppem = (FT_UShort)(dim_x >> 6);
- metrics->y_ppem = (FT_UShort)(dim_y >> 6);
+ metrics->x_ppem = (FT_UShort)(dim_x >> 6);
+ metrics->y_ppem = (FT_UShort)(dim_y >> 6);
- metrics->x_scale = 0x10000;
- metrics->y_scale = 0x10000;
- if ( face->face_flags & FT_FACE_FLAG_SCALABLE)
+ metrics->x_scale = 0x10000L;
+ metrics->y_scale = 0x10000L;
+
+ if ( face->face_flags & FT_FACE_FLAG_SCALABLE )
{
metrics->x_scale = FT_DivFix( dim_x, face->units_per_EM );
metrics->y_scale = FT_DivFix( dim_y, face->units_per_EM );
@@ -1609,20 +1677,26 @@
/* FT_Set_Pixel_Sizes */
/* */
/* <Description> */
- /* Sets the character dimensions of a given size object. The width */
+ /* Sets the character dimensions of a given face object. The width */
/* and height are expressed in integer pixels. */
/* */
+ /* If one of the character dimensions is zero, its value is set equal */
+ /* to the other. */
+ /* */
+ /* <InOut> */
+ /* face :: A handle to the target face object. */
+ /* */
/* <Input> */
- /* size :: A handle to a target size object. */
/* pixel_width :: The character width, in integer pixels. */
+ /* */
/* pixel_height :: The character height, in integer pixels. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Set_Pixel_Sizes( FT_Face face,
- FT_UInt pixel_width,
- FT_UInt pixel_height )
+ FT_EXPORT_FUNC( FT_Error ) FT_Set_Pixel_Sizes( FT_Face face,
+ FT_UInt pixel_width,
+ FT_UInt pixel_height )
{
FT_Error error;
FT_Driver driver;
@@ -1630,6 +1704,7 @@
FT_DriverInterface* interface;
FT_Size_Metrics* metrics = &face->size->metrics;
+
if ( !face || !face->size || !face->driver )
return FT_Err_Invalid_Face_Handle;
@@ -1637,11 +1712,10 @@
interface = &driver->interface;
memory = driver->memory;
- /* default processing - this can be overriden by the driver */
- if (pixel_width == 0)
+ /* default processing -- this can be overridden by the driver */
+ if ( pixel_width == 0 )
pixel_width = pixel_height;
-
- else if (pixel_height == 0)
+ else if ( pixel_height == 0 )
pixel_height = pixel_width;
if ( pixel_width < 1 ) pixel_width = 1;
@@ -1684,10 +1758,10 @@
/* aslot :: A handle to a new glyph slot object. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_New_GlyphSlot( FT_Face face,
- FT_GlyphSlot* aslot )
+ FT_EXPORT_FUNC( FT_Error ) FT_New_GlyphSlot( FT_Face face,
+ FT_GlyphSlot* aslot )
{
FT_Error error;
FT_Driver driver;
@@ -1746,9 +1820,9 @@
/* <Input> */
/* slot :: A handle to a target glyph slot. */
/* */
- FT_EXPORT_FUNC(void) FT_Done_GlyphSlot( FT_GlyphSlot slot )
+ FT_EXPORT_FUNC( void ) FT_Done_GlyphSlot( FT_GlyphSlot slot )
{
- if (slot)
+ if ( slot )
{
FT_Driver driver = slot->face->driver;
FT_Memory memory = driver->memory;
@@ -1781,16 +1855,12 @@
/* FT_Load_Glyph */
/* */
/* <Description> */
- /* A function used to load a single glyph within a given glyph slot, */
- /* for a given size. */
+ /* A function used to load a single glyph within a given face. */
/* */
/* <Input> */
- /* slot :: A handle to a target slot object where the glyph */
+ /* face :: A handle to a target face object where the glyph */
/* will be loaded. */
/* */
- /* size :: A handle to the source face size at which the glyph */
- /* must be scaled/loaded. */
- /* */
/* glyph_index :: The index of the glyph in the font file. */
/* */
/* load_flags :: A flag indicating what to load for this glyph. The */
@@ -1798,24 +1868,18 @@
/* glyph loading process (e.g., whether the outline */
/* should be scaled, whether to load bitmaps or not, */
/* whether to hint the outline, etc). */
- /* <Output> */
- /* result :: A set of bit flags indicating the type of data that */
- /* was loaded in the glyph slot (outline or bitmap, */
- /* etc). */
- /* */
- /* You can set this field to 0 if you don't want this */
- /* information. */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Load_Glyph( FT_Face face,
- FT_UInt glyph_index,
- FT_Int load_flags )
+ FT_EXPORT_FUNC( FT_Error ) FT_Load_Glyph( FT_Face face,
+ FT_UInt glyph_index,
+ FT_Int load_flags )
{
FT_Error error;
FT_Driver driver;
+
if ( !face || !face->size || !face->glyph )
return FT_Err_Invalid_Face_Handle;
@@ -1825,7 +1889,7 @@
driver = face->driver;
/* when the flag NO_RECURSE is set, we disable hinting and scaling */
- if (load_flags & FT_LOAD_NO_RECURSE)
+ if ( load_flags & FT_LOAD_NO_RECURSE )
load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING;
error = driver->interface.load_glyph( face->glyph,
@@ -1837,21 +1901,47 @@
}
- FT_EXPORT_FUNC(FT_Error) FT_Load_Char( FT_Face face,
- FT_ULong char_code,
- FT_Int load_flags )
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Load_Char */
+ /* */
+ /* <Description> */
+ /* A function used to load a single character within a given face */
+ /* and the selected charmap (to be done with the FT_Select_Charmap() */
+ /* function). */
+ /* */
+ /* <Input> */
+ /* face :: A handle to a target face object where the */
+ /* character will be loaded. */
+ /* */
+ /* char_code :: The character code of the glyph in the font file. */
+ /* */
+ /* load_flags :: A flag indicating what to load for this glyph. The */
+ /* FT_LOAD_XXX constants can be used to control the */
+ /* glyph loading process (e.g., whether the outline */
+ /* should be scaled, whether to load bitmaps or not, */
+ /* whether to hint the outline, etc). */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
+ FT_EXPORT_FUNC( FT_Error ) FT_Load_Char( FT_Face face,
+ FT_ULong char_code,
+ FT_Int load_flags )
{
FT_Error error;
FT_Driver driver;
FT_UInt glyph_index;
- if (!face || !face->size || !face->glyph || !face->charmap )
+
+ if ( !face || !face->size || !face->glyph || !face->charmap )
return FT_Err_Invalid_Face_Handle;
driver = face->driver;
glyph_index = FT_Get_Char_Index( face, char_code );
- if (glyph_index == 0)
+ if ( glyph_index == 0 )
error = FT_Err_Invalid_Character_Code;
else
error = driver->interface.load_glyph( face->glyph,
@@ -1861,6 +1951,7 @@
return error;
}
+
/*************************************************************************/
/* */
/* <Function> */
@@ -1890,10 +1981,10 @@
/* kernings, are out of the scope of this API function -- they can be */
/* implemented through format-specific interfaces. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Get_Kerning( FT_Face face,
- FT_UInt left_glyph,
- FT_UInt right_glyph,
- FT_Vector* kerning )
+ FT_EXPORT_FUNC( FT_Error ) FT_Get_Kerning( FT_Face face,
+ FT_UInt left_glyph,
+ FT_UInt right_glyph,
+ FT_Vector* kerning )
{
FT_Error error;
FT_Driver driver;
@@ -1911,8 +2002,10 @@
if ( driver->interface.get_kerning )
{
- error = driver->interface.get_kerning( face, left_glyph,
- right_glyph, kerning );
+ error = driver->interface.get_kerning( face,
+ left_glyph,
+ right_glyph,
+ kerning );
}
else
{
@@ -1925,31 +2018,35 @@
return error;
}
+
/*************************************************************************/
/* */
/* <Function> */
/* FT_Select_Charmap */
/* */
/* <Description> */
- /* Selects a given charmap by its encoding tag. */
+ /* Selects a given charmap by its encoding tag (as listed in */
+ /* `freetype.h'). */
/* */
/* <Input> */
/* face :: A handle to the source face object. */
- /* encoding :: handle to the selected charmap */
+ /* */
+ /* encoding :: A handle to the selected charmap. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
/* <Note> */
/* This function will return an error if no charmap in the face */
- /* corresponds to the encoding queried here */
+ /* corresponds to the encoding queried here. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Select_Charmap( FT_Face face,
- FT_Encoding encoding )
+ FT_EXPORT_FUNC( FT_Error ) FT_Select_Charmap( FT_Face face,
+ FT_Encoding encoding )
{
FT_CharMap* cur = face->charmaps;
FT_CharMap* limit = cur + face->num_charmaps;
+
for ( ; cur < limit; cur++ )
{
if ( cur[0]->encoding == encoding )
@@ -1973,22 +2070,23 @@
/* */
/* <Input> */
/* face :: A handle to the source face object. */
- /* charmap :: handle to the selected charmap */
+ /* charmap :: A handle to the selected charmap. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
/* <Note> */
- /* this function will return an error when the charmap is not part */
- /* of the face (i.e. if it is not listed in the face->charmaps[] */
+ /* This function will return an error when the charmap is not part */
+ /* of the face (i.e., if it is not listed in the face->charmaps[] */
/* table). */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Set_Charmap( FT_Face face,
- FT_CharMap charmap )
+ FT_EXPORT_FUNC( FT_Error ) FT_Set_Charmap( FT_Face face,
+ FT_CharMap charmap )
{
FT_CharMap* cur = face->charmaps;
FT_CharMap* limit = cur + face->num_charmaps;
+
for ( ; cur < limit; cur++ )
{
if ( cur[0] == charmap )
@@ -2000,6 +2098,7 @@
return FT_Err_Invalid_Argument;
}
+
/*************************************************************************/
/* */
/* <Function> */
@@ -2010,18 +2109,19 @@
/* uses a charmap object to do the translation. */
/* */
/* <Input> */
- /* charmap :: A handle to a filter charmap object. */
+ /* face :: A handle to the source face object. */
/* charcode :: The character code. */
/* */
/* <Return> */
/* The glyph index. 0 means `undefined character code'. */
/* */
- FT_EXPORT_FUNC(FT_UInt) FT_Get_Char_Index( FT_Face face,
- FT_ULong charcode )
+ FT_EXPORT_FUNC( FT_UInt ) FT_Get_Char_Index( FT_Face face,
+ FT_ULong charcode )
{
FT_UInt result;
FT_Driver driver;
+
result = 0;
if ( face && face->charmap )
{
@@ -2032,55 +2132,54 @@
}
- /***************************************************************************
- *
- * <Function>
- * FT_Get_Sfnt_Table
- *
- * <Description>
- * Returns a pointer to a given SFNT table within a face.
- *
- * <Input>
- * face :: handle to source
- * tag :: index if SFNT table
- *
- * <Return>
- * type-less pointer to the table. This will be 0 in case of error, or
- * when the corresponding table was not found *OR* loaded from the file.
- *
- * <Note>
- * The table is owned by the face object, and disappears with it.
- *
- * This function is only useful to access Sfnt tables that are loaded
- * by the sfnt/truetype/opentype drivers. See FT_Sfnt_tag for a list.
- *
- * You can load any table with a different function.. XXX
- *
- ***************************************************************************/
-
-
- FT_EXPORT_FUNC(void*) FT_Get_Sfnt_Table( FT_Face face,
- FT_Sfnt_Tag tag )
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Get_Sfnt_Table */
+ /* */
+ /* <Description> */
+ /* Returns a pointer to a given SFNT table within a face. */
+ /* */
+ /* <Input> */
+ /* face :: A handle to the source face object. */
+ /* tag :: An index of an SFNT table. */
+ /* */
+ /* <Return> */
+ /* A type-less pointer to the table. This will be 0 in case of */
+ /* error, or if the corresponding table was not found *OR* loaded */
+ /* from the file. */
+ /* */
+ /* <Note> */
+ /* The table is owned by the face object, and disappears with it. */
+ /* */
+ /* This function is only useful to access SFNT tables that are loaded */
+ /* by the sfnt/truetype/opentype drivers. See the FT_Sfnt_Tag */
+ /* enumeration in `tttables.h' for a list. */
+ /* */
+ /* You can load any table with a different function.. XXX */
+ /* */
+ FT_EXPORT_FUNC( void* ) FT_Get_Sfnt_Table( FT_Face face,
+ FT_Sfnt_Tag tag )
{
void* table = 0;
FT_Get_Sfnt_Table_Func func;
FT_Driver driver;
- if (!face || !FT_IS_SFNT(face))
+
+ if ( !face || !FT_IS_SFNT( face ) )
goto Exit;
driver = face->driver;
func = (FT_Get_Sfnt_Table_Func)driver->interface.get_interface(
- driver, "get_sfnt" );
- if (func)
- table = func(face,tag);
+ driver, "get_sfnt" );
+ if ( func )
+ table = func( face, tag );
Exit:
return table;
}
-
/*************************************************************************/
/* */
/* <Function> */
@@ -2094,9 +2193,9 @@
/* library :: A handle to the target library object. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
- FT_EXPORT_FUNC(FT_Error) FT_Done_FreeType( FT_Library library )
+ FT_EXPORT_FUNC( FT_Error ) FT_Done_FreeType( FT_Library library )
{
/* Discard the library object */
FT_Done_Library( library );
@@ -2104,4 +2203,5 @@
return FT_Err_Ok;
}
+
/* END */