Commit 7880dd6630a77a1465681473ff00b3735d466e3f
2000-01-10T17:19:45
ftcalc.c, ftextend.c, ftoutln.c, ftraster.c, ftstream.c: Removing trailing spaces. ftlist.h: Removing duplicated documentation (which is in ftlist.c also). ftinit.c, ftlist.c, ftobjs.c: Formatting, 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 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index 008c281..e2cc4d7 100644
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -55,7 +55,7 @@
{
FT_ULong val, root, newroot, mask;
-
+
root = 0;
mask = 0x40000000;
val = (FT_ULong)x;
@@ -73,11 +73,11 @@
mask >>= 2;
}
while ( mask != 0 );
-
+
return root;
}
-
+
#ifdef LONG64
@@ -203,7 +203,7 @@
/* check for divide by 0 */
q = 0x7FFFFFFF;
- else
+ else
/* compute result directly */
q = ((FT_Int64)a << 16) / b;
@@ -481,7 +481,7 @@
{
FT_Word32 lo1, hi1, lo2, hi2, lo, hi, i1, i2;
-
+
lo1 = x & 0x0000FFFF; hi1 = x >> 16;
lo2 = y & 0x0000FFFF; hi2 = y >> 16;
diff --git a/src/base/ftextend.c b/src/base/ftextend.c
index 0cc0df3..20691b6 100644
--- a/src/base/ftextend.c
+++ b/src/base/ftextend.c
@@ -37,7 +37,7 @@
FT_Int num_extensions;
FT_Long cur_offset;
FT_Extension_Class classes[FT_MAX_EXTENSIONS];
-
+
} FT_Extension_Registry;
@@ -94,7 +94,7 @@
{
FT_Memory memory = driver->memory;
-
+
FREE( driver->extensions );
return FT_Err_Ok;
}
@@ -128,11 +128,11 @@
FT_Int n = registry->num_extensions;
FT_Extension_Class* cur = registry->classes + n;
-
+
if ( n >= FT_MAX_EXTENSIONS )
return FT_Err_Too_Many_Extensions;
- *cur = *class;
+ *cur = *class;
cur->offset = registry->cur_offset;
@@ -167,18 +167,18 @@
EXPORT_FUNC
void* FT_Get_Extension( FT_Face face,
const char* extension_id,
- void* *extension_interface )
+ void* *extension_interface )
{
FT_Extension_Registry* registry;
-
+
registry = (FT_Extension_Registry*)face->driver->extensions;
if ( registry && face->extensions )
{
FT_Extension_Class* cur = registry->classes;
FT_Extension_Class* limit = cur + registry->num_extensions;
-
+
for ( ; cur < limit; cur++ )
if ( strcmp( cur->id, extension_id ) == 0 )
{
@@ -186,7 +186,7 @@
return (void*)((char*)face->extensions + cur->offset);
}
}
-
+
/* could not find the extension id */
*extension_interface = 0;
@@ -217,22 +217,22 @@
FT_Extension_Registry* registry;
FT_Memory memory;
-
+
registry = (FT_Extension_Registry*)face->driver->extensions;
if ( registry && face->extensions )
{
FT_Extension_Class* cur = registry->classes;
FT_Extension_Class* limit = cur + registry->num_extensions;
-
+
for ( ; cur < limit; cur++ )
{
char* ext = (char*)face->extensions + cur->offset;
-
+
if ( cur->finalize )
cur->finalize( ext, face );
}
-
+
memory = face->driver->memory;
FREE( face->extensions );
}
@@ -266,28 +266,28 @@
FT_Memory memory;
FT_Error error;
-
+
face->extensions = 0;
-
+
/* load extensions registry, exit successfully if none is there */
registry = (FT_Extension_Registry*)face->driver->extensions;
if ( !registry )
return FT_Err_Ok;
-
+
memory = face->driver->memory;
if ( ALLOC( face->extensions, registry->cur_offset ) )
return error;
-
+
{
FT_Extension_Class* cur = registry->classes;
FT_Extension_Class* limit = cur + registry->num_extensions;
-
+
for ( ; cur < limit; cur++ )
{
char* ext = (char*)face->extensions + cur->offset;
-
+
if ( cur->init )
{
error = cur->init( ext, face );
diff --git a/src/base/ftinit.c b/src/base/ftinit.c
index 56f41f6..01e1454 100644
--- a/src/base/ftinit.c
+++ b/src/base/ftinit.c
@@ -4,7 +4,7 @@
/* */
/* FreeType initialisation layer (body). */
/* */
-/* Copyright 1996-1999 by */
+/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used */
@@ -15,37 +15,31 @@
/* */
/***************************************************************************/
- /**************************************************************************
- *
- * The purpose of this file is to implement the three following
- * functions:
- *
- * 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.
- *
- *
- * 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 finalise 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"
- *
- *
- *
- *
- *
- ************************************************************************/
+ /*************************************************************************/
+ /* */
+ /* The purpose of this file is to implement the three following */
+ /* functions: */
+ /* */
+ /* 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. */
+ /* */
+ /* 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'. */
+ /* */
+ /*************************************************************************/
+
#include <ftobjs.h>
#include <ftconfig.h>
@@ -56,17 +50,20 @@
#define FT_COMPONENT trace_init
#undef FT_DRIVER
-#define FT_DRIVER(x) extern FT_DriverInterface x;
+#define FT_DRIVER( x ) extern FT_DriverInterface x;
+
#include <ftmodule.h>
#undef FT_DRIVER
-#define FT_DRIVER(x) &x,
+#define FT_DRIVER( x ) &x,
static
-const FT_DriverInterface* ft_default_drivers[] = {
+const FT_DriverInterface* ft_default_drivers[] =
+ {
#include <ftmodule.h>
- 0
-};
+ 0
+ };
+
/*************************************************************************/
/* */
@@ -76,7 +73,7 @@ const FT_DriverInterface* ft_default_drivers[] = {
/* <Description> */
/* Adds the set of default drivers to a given library object. */
/* */
- /* <Input> */
+ /* <InOut> */
/* library :: A handle to a new library object. */
/* */
EXPORT_FUNC
@@ -85,16 +82,15 @@ const FT_DriverInterface* ft_default_drivers[] = {
FT_Error error;
const FT_DriverInterface* *cur;
+
cur = ft_default_drivers;
- while (*cur)
+ while ( *cur )
{
error = FT_Add_Driver( library, *cur );
/* notify errors, but don't stop */
- if (error)
- {
- FT_ERROR(( "FT.Default_Drivers: cannot install `%s', error = %x\n",
+ if ( error )
+ FT_ERROR(( "FT.Default_Drivers: Cannot install `%s', error = %x\n",
(*cur)->driver_name, error ));
- }
cur++;
}
}
@@ -113,7 +109,7 @@ const FT_DriverInterface* ft_default_drivers[] = {
/* library :: A handle to a new library object. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeTyoe error code. 0 means success. */
/* */
EXPORT_FUNC
FT_Error FT_Init_FreeType( FT_Library* library )
@@ -121,22 +117,25 @@ const FT_DriverInterface* ft_default_drivers[] = {
FT_Error error;
FT_Memory memory;
- /* First of all, allocate a new system object -this function is part */
- /* of the system-specific component, i.e. ftsystem.c */
+
+ /* 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();
- if (!memory)
+ if ( !memory )
{
FT_ERROR(( "FT_Init_FreeType:" ));
FT_ERROR(( " cannot find memory manager" ));
return FT_Err_Unimplemented_Feature;
}
-
+
/* builds a library out of it, then fill it with the set of */
- /* default drivers.. */
+ /* default drivers. */
+
error = FT_New_Library( memory, library );
if ( !error )
- FT_Default_Drivers(*library);
-
+ FT_Default_Drivers( *library );
+
return error;
}
diff --git a/src/base/ftlist.c b/src/base/ftlist.c
index fd2241f..a7db223 100644
--- a/src/base/ftlist.c
+++ b/src/base/ftlist.c
@@ -4,7 +4,7 @@
/* */
/* Generic list support for FreeType (body). */
/* */
-/* Copyright 1996-1999 by */
+/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used */
@@ -15,11 +15,10 @@
/* */
/***************************************************************************/
-
/*************************************************************************/
/* */
/* This file implements functions relative to list processing. Its */
- /* data structures are defined in freetype.h. */
+ /* data structures are defined in `freetype.h'. */
/* */
/*************************************************************************/
@@ -54,7 +53,7 @@
cur = list->head;
while ( cur )
{
- if (cur->data == data)
+ if ( cur->data == data )
return cur;
cur = cur->next;
@@ -70,7 +69,7 @@
/* FT_List_Add */
/* */
/* <Description> */
- /* Appends an element at the end of a list. */
+ /* Appends an element to the end of a list. */
/* */
/* <InOut> */
/* list :: A pointer to the parent list. */
@@ -222,7 +221,7 @@
/* argument to the iterator. */
/* */
/* <Return> */
- /* The result of the last iterator call. */
+ /* The result (an error code) of the last iterator call. */
/* */
BASE_FUNC
FT_Error FT_List_Iterate( FT_List list,
@@ -270,10 +269,10 @@
/* argument to the destructor. */
/* */
BASE_FUNC
- void FT_List_Finalize( FT_List list,
- FT_List_Destructor destroy,
- FT_Memory memory,
- void* user )
+ void FT_List_Finalize( FT_List list,
+ FT_List_Destructor destroy,
+ FT_Memory memory,
+ void* user )
{
FT_ListNode cur;
diff --git a/src/base/ftlist.h b/src/base/ftlist.h
index 2319326..6241115 100644
--- a/src/base/ftlist.h
+++ b/src/base/ftlist.h
@@ -4,7 +4,7 @@
/* */
/* Generic list support for FreeType (specification). */
/* */
-/* Copyright 1996-1999 by */
+/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used */
@@ -15,11 +15,10 @@
/* */
/***************************************************************************/
-
/*************************************************************************/
/* */
/* This file implements functions relative to list processing. Its */
- /* data structures are defined in freetype.h. */
+ /* data structures are defined in `freetype.h'. */
/* */
/*************************************************************************/
@@ -34,93 +33,22 @@
#endif
- /*************************************************************************/
- /* */
- /* <Function> */
- /* FT_List_Find */
- /* */
- /* <Description> */
- /* Finds the list node for a given listed object. */
- /* */
- /* <Input> */
- /* list :: A pointer to the parent list. */
- /* data :: The address of the listed object. */
- /* */
- /* <Return> */
- /* List node. NULL if it wasn't found. */
- /* */
EXPORT_DEF
FT_ListNode FT_List_Find( FT_List list,
void* data );
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* FT_List_Add */
- /* */
- /* <Description> */
- /* Appends an element at the end of a list. */
- /* */
- /* <InOut> */
- /* list :: A pointer to the parent list. */
- /* node :: The node to append. */
- /* */
EXPORT_DEF
void FT_List_Add( FT_List list,
FT_ListNode node );
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* FT_List_Insert */
- /* */
- /* <Description> */
- /* Inserts an element at the head of a list. */
- /* */
- /* <InOut> */
- /* list :: A pointer to parent list. */
- /* node :: The node to insert. */
- /* */
EXPORT_DEF
void FT_List_Insert( FT_List list,
FT_ListNode node );
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* FT_List_Remove */
- /* */
- /* <Description> */
- /* Removes a node from a list. This function doesn't check whether */
- /* the node is in the list! */
- /* */
- /* <Input> */
- /* node :: The node to remove. */
- /* */
- /* <InOut> */
- /* list :: A pointer to the parent list. */
- /* */
EXPORT_DEF
void FT_List_Remove( FT_List list,
FT_ListNode node );
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* FT_List_Up */
- /* */
- /* <Description> */
- /* Moves a node to the head/top of a list. Used to maintain LRU */
- /* lists. */
- /* */
- /* <InOut> */
- /* list :: A pointer to the parent list. */
- /* node :: The node to move. */
- /* */
EXPORT_DEF
void FT_List_Up( FT_List list,
FT_ListNode node );
@@ -144,26 +72,6 @@
void* user );
- /*************************************************************************/
- /* */
- /* <Function> */
- /* FT_List_Iterate */
- /* */
- /* <Description> */
- /* Parses a list and calls a given iterator function on each element. */
- /* Note that parsing is stopped as soon as one of the iterator calls */
- /* returns a non-zero value. */
- /* */
- /* <Input> */
- /* list :: A handle to the list. */
- /* iterator :: An interator function, called on each node of the */
- /* list. */
- /* user :: A user-supplied field which is passed as the second */
- /* argument to the iterator. */
- /* */
- /* <Return> */
- /* The result of the last iterator call. */
- /* */
EXPORT_DEF
FT_Error FT_List_Iterate( FT_List list,
FT_List_Iterator iterator,
@@ -177,40 +85,20 @@
/* */
/* <Description> */
/* An FT_List iterator function which is called during a list */
- /* finalisation by FT_List_Finalize() to destroy all elements in a */
+ /* finalization by FT_List_Finalize() to destroy all elements in a */
/* given list. */
/* */
/* <Input> */
/* system :: The current system object. */
/* data :: The current object to destroy. */
/* user :: A typeless pointer passed to FT_List_Iterate(). It can */
- /* used to point to the iteration's state. */
+ /* be used to point to the iteration's state. */
/* */
typedef void (*FT_List_Destructor)( FT_Memory memory,
void* data,
void* user );
- /*************************************************************************/
- /* */
- /* <Function> */
- /* FT_List_Finalize */
- /* */
- /* <Description> */
- /* Destroys all elements in the list as well as the list itself. */
- /* */
- /* <Input> */
- /* list :: A handle to the list. */
- /* */
- /* destroy :: A list destructor that will be applied to each element */
- /* of the list. */
- /* */
- /* system :: The current system object where destructions take */
- /* place. */
- /* */
- /* user :: A user-supplied field which is passed as the last */
- /* argument to the destructor. */
- /* */
EXPORT_DEF
void FT_List_Finalize( FT_List list,
FT_List_Destructor destroy,
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 9e8e933..21f495b 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -4,7 +4,7 @@
/* */
/* The FreeType private base classes (base). */
/* */
-/* Copyright 1996-1999 by */
+/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg */
/* */
/* This file is part of the FreeType project, and may only be used */
@@ -20,6 +20,8 @@
#include <ftdebug.h>
#include <ftstream.h>
+
+
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@@ -35,7 +37,7 @@
/*************************************************************************/
/* */
/* The macro FT_COMPONENT is used in trace mode. It is an implicit */
- /* parameter of the PTRACE() and PERROR() macros, used to print/log */
+ /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
/* messages during execution. */
/* */
#undef FT_COMPONENT
@@ -71,13 +73,13 @@
{
FT_Assert( P != 0 );
- if (size > 0)
+ if ( size > 0 )
{
*P = memory->alloc( memory, size );
- if (!*P)
+ if ( !*P )
{
FT_ERROR(( "FT.Alloc:" ));
- FT_ERROR(( " out of memory ? (%ld requested)\n",
+ FT_ERROR(( " Out of memory? (%ld requested)\n",
size ));
return FT_Err_Out_Of_Memory;
@@ -109,7 +111,7 @@
/* occurs. */
/* */
/* current :: current block size in bytes */
- /* size :: the new block size in bytes */
+ /* size :: the new block size in bytes */
/* */
/* <InOut> */
/* P :: A pointer to the fresh new block. It should be set to */
@@ -122,10 +124,10 @@
/* All callers of FT_Realloc _must_ provide the current block size */
/* as well as the new one. */
/* */
- /* When the memory object's flag FT_SYSTEM_FLAG_NO_REALLOC is */
- /* set, this function will try to emulate a realloc through uses */
- /* of FT_Alloc and FT_Free. Otherwise, it will call the system- */
- /* specific "realloc" implementation. */
+ /* If the memory object's flag FT_SYSTEM_FLAG_NO_REALLOC is set, this */
+ /* function will try to emulate a reallocation using FT_Alloc() and */
+ /* FT_Free(). Otherwise, it will call the system-specific `realloc' */
+ /* implementation. */
/* */
/* (Some embedded systems do not have a working realloc). */
/* */
@@ -137,6 +139,7 @@
{
void* Q;
+
FT_Assert( P != 0 );
/* if the original pointer is NULL, call FT_Alloc() */
@@ -151,14 +154,15 @@
}
Q = memory->realloc( memory, current, size, *P );
- if ( !Q ) goto Fail;
+ if ( !Q )
+ goto Fail;
*P = Q;
return FT_Err_Ok;
Fail:
FT_ERROR(( "FT.Realloc:" ));
- FT_ERROR(( " failed (current %ld, requested %ld)\n",
+ FT_ERROR(( " Failed (current %ld, requested %ld)\n",
current, size ));
return FT_Err_Out_Of_Memory;
}
@@ -189,14 +193,14 @@
/* */
BASE_FUNC
void FT_Free( FT_Memory memory,
- void* *P )
+ void* *P )
{
FT_TRACE2(( "FT_Free:" ));
FT_TRACE2(( " Freeing block 0x%08lx, ref 0x%08lx\n",
(long)P, (P ? (long)*P : -1) ));
FT_Assert( P != 0 );
-
+
if ( *P )
{
memory->free( memory, *P );
@@ -204,6 +208,8 @@
}
}
+
+
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@@ -216,46 +222,46 @@
/*************************************************************************/
/*************************************************************************/
- /* destructor for sizes list */
- static
- void destroy_size( FT_Memory memory,
- FT_Size size,
- FT_Driver driver )
- {
- /* finalize format-specific stuff */
- driver->interface.done_size( size );
- FREE( size );
- }
+ /* destructor for sizes list */
+ static
+ void destroy_size( FT_Memory memory,
+ FT_Size size,
+ FT_Driver driver )
+ {
+ /* finalize format-specific stuff */
+ driver->interface.done_size( size );
+ FREE( size );
+ }
- /* destructor for faces list */
- static
- void destroy_face( FT_Memory memory,
- FT_Face face,
- FT_Driver driver )
- {
- /* Discard glyph slots for this face */
- /* XXX: Beware! FT_Done_GlyphSlot() changes the field `face->slot' */
- while ( face->glyph )
- FT_Done_GlyphSlot( face->glyph );
-
- /* Discard all sizes for this face */
- FT_List_Finalize( &face->sizes_list,
- (FT_List_Destructor)destroy_size,
- memory,
- driver );
- face->size = 0;
-
- /* finalize format-specific stuff */
- driver->interface.done_face( face );
-
- /* Now discard client data */
- if ( face->generic.finalizer )
- face->generic.finalizer( face );
-
- /* get rid of it */
- FREE( face );
- }
+ /* destructor for faces list */
+ static
+ void destroy_face( FT_Memory memory,
+ FT_Face face,
+ FT_Driver driver )
+ {
+ /* Discard glyph slots for this face */
+ /* XXX: Beware! FT_Done_GlyphSlot() changes the field `face->slot' */
+ while ( face->glyph )
+ FT_Done_GlyphSlot( face->glyph );
+
+ /* Discard all sizes for this face */
+ FT_List_Finalize( &face->sizes_list,
+ (FT_List_Destructor)destroy_size,
+ memory,
+ driver );
+ face->size = 0;
+
+ /* finalize format-specific stuff */
+ driver->interface.done_face( face );
+
+ /* Now discard client data */
+ if ( face->generic.finalizer )
+ face->generic.finalizer( face );
+
+ /* get rid of it */
+ FREE( face );
+ }
/*************************************************************************/
@@ -267,19 +273,17 @@
/* Destroys a given driver object. This also destroys all child */
/* faces. */
/* */
- /* <Input> */
+ /* <InOut> */
/* driver :: A handle to the target driver object. */
/* */
- /* <Return> */
- /* Error code. 0 means success. */
- /* */
/* <Note> */
- /* The driver _must_ be LOCKED! */
+ /* The driver _must_ be LOCKED! */
/* */
static
- void Destroy_Driver( FT_Driver driver )
+ void Destroy_Driver( FT_Driver driver )
{
- FT_Memory memory = driver->memory;
+ FT_Memory memory = driver->memory;
+
/* now, finalize all faces in the driver list */
FT_List_Finalize( &driver->faces_list,
@@ -288,34 +292,47 @@
driver );
/* finalize the driver object */
- if (driver->interface.done_driver)
- driver->interface.done_driver(driver);
+ if ( driver->interface.done_driver )
+ driver->interface.done_driver( driver );
/* finalize client-data */
- if (driver->generic.finalizer)
- driver->generic.finalizer(driver);
+ if ( driver->generic.finalizer )
+ driver->generic.finalizer( driver );
/* discard it */
FREE( driver );
}
-
-
-
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Get_Glyph_Format */
+ /* */
+ /* <Description> */
+ /* Gets the glyph format for a given format tag. */
+ /* */
+ /* <Input> */
+ /* library :: A handle to the library object. */
+ /* format_tag :: A tag identifying the glyph format. */
+ /* */
+ /* <Return> */
+ /* A pointer to a glyph format. 0 if `format_tag' isn't defined. */
+ /* */
BASE_FUNC
FT_Glyph_Format* FT_Get_Glyph_Format( FT_Library library,
FT_Glyph_Tag format_tag )
{
FT_Glyph_Format* cur = library->glyph_formats;
FT_Glyph_Format* limit = cur + FT_MAX_GLYPH_FORMATS;
-
+
+
for ( ; cur < limit; cur ++ )
{
if ( cur->format_tag == format_tag )
return cur;
}
-
+
return 0;
}
@@ -326,18 +343,19 @@
/* FT_Set_Raster */
/* */
/* <Description> */
- /* This function is used to change the raster module used to convert */
- /* from a given memory object. It is thus possible to use libraries */
- /* with distinct memory allocators within the same program. */
+ /* This function changes the raster module used to convert from a */
+ /* given memory object. It is thus possible to use libraries with */
+ /* distinct memory allocators within the same program. */
/* */
/* <Input> */
- /* memory :: A handle to the original memory object. */
+ /* library :: A handle to the library object. */
+ /* interface :: A pointer to the interface of the new raster module. */
/* */
/* <Output> */
- /* library :: A handle to a new library object. */
+ /* raster :: A handle to the raster object. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
EXPORT_FUNC
FT_Error FT_Set_Raster( FT_Library library,
@@ -348,6 +366,7 @@
FT_Error error = FT_Err_Ok;
FT_Glyph_Format* format;
+
/* allocate the render pool if necessary */
if ( !library->raster_pool &&
ALLOC( library->raster_pool, FT_RENDER_POOL_SIZE ) )
@@ -355,37 +374,37 @@
/* find the glyph formatter for the raster's format */
format = FT_Get_Glyph_Format( library, interface->format_tag );
- if (!format)
+ if ( !format )
{
error = FT_Err_Invalid_Argument;
goto Exit;
}
-
+
/* free previous raster object if necessary */
- if (format->raster_allocated)
+ if ( format->raster_allocated )
{
FREE( format->raster );
format->raster_allocated = 0;
}
-
+
/* allocate new raster object is necessary */
- if (!raster)
+ if ( !raster )
{
if ( ALLOC( raster, interface->size ) )
goto Exit;
-
+
format->raster_allocated = 1;
}
format->raster = raster;
format->raster_interface = interface;
-
+
/* initialize the raster object */
error = interface->init( raster,
(char*)library->raster_pool,
FT_RENDER_POOL_SIZE );
- if (error)
+ if ( error )
{
- if (format->raster_allocated)
+ if ( format->raster_allocated )
{
FREE( format->raster );
format->raster_allocated = 0;
@@ -396,54 +415,106 @@
return error;
}
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Set_Debug_Hook */
+ /* */
+ /* <Description> */
+ /* Sets a debug hook function for debugging the interpreter of a */
+ /* font format. */
+ /* */
+ /* <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. */
+ /* */
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;
- }
}
-
-
-
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Add_Glyph_Format */
+ /* */
+ /* <Description> */
+ /* Adds a glyph format to the library. */
+ /* */
+ /* <InOut> */
+ /* library :: A handle to the library object. */
+ /* */
+ /* <Input> */
+ /* format :: A pointer to the new glyph format. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
BASE_FUNC
FT_Error FT_Add_Glyph_Format( FT_Library library,
FT_Glyph_Format* format )
{
FT_Glyph_Format* new = 0;
-
+
{
- FT_Glyph_Format* cur = library->glyph_formats;
+ FT_Glyph_Format* cur = library->glyph_formats;
FT_Glyph_Format* limit = cur + FT_MAX_GLYPH_FORMATS;
-
+
+
for ( ; cur < limit; cur++ )
{
/* return an error if the format is already registered */
if ( cur->format_tag == format->format_tag )
return FT_Err_Invalid_Glyph_Format;
-
+
if ( cur->format_tag == 0 && new == 0 )
new = cur;
}
}
-
+
/* if there is no place to hold the new format, return an error */
if (!new)
return FT_Err_Too_Many_Glyph_Formats;
-
+
*new = *format;
-
+
/* now, create a raster object if we need to */
return FT_Set_Raster( library,
format->raster_interface,
format->raster );
}
-
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Remove_Glyph_Format */
+ /* */
+ /* <Description> */
+ /* Removes a glyph format from the library. */
+ /* */
+ /* <InOut> */
+ /* library :: A handle to the library object. */
+ /* */
+ /* <Input> */
+ /* format_tag :: A tag identifying the format to be removed. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
BASE_FUNC
FT_Error FT_Remove_Glyph_Format( FT_Library library,
FT_Glyph_Tag format_tag )
@@ -451,14 +522,15 @@
FT_Memory memory;
FT_Glyph_Format* cur = library->glyph_formats;
FT_Glyph_Format* limit = cur + FT_MAX_GLYPH_FORMATS;
-
+
+
memory = library->memory;
-
+
for ( ; cur < limit; cur++ )
{
- if (cur->format_tag == format_tag)
+ if ( cur->format_tag == format_tag )
{
- if (cur->raster_allocated)
+ if ( cur->raster_allocated )
{
FREE( cur->raster );
cur->raster_allocated = 0;
@@ -467,7 +539,7 @@
return FT_Err_Ok;
}
}
-
+
return FT_Err_Invalid_Argument;
}
@@ -483,13 +555,13 @@
/* with distinct memory allocators within the same program. */
/* */
/* <Input> */
- /* memory :: A handle to the original memory object. */
+ /* memory :: A handle to the original memory object. */
/* */
/* <Output> */
- /* library :: A handle to a new library object. */
+ /* alibrary :: A pointer to handle of a new library object. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
EXPORT_FUNC
FT_Error FT_New_Library( FT_Memory memory,
@@ -498,6 +570,7 @@
FT_Library library = 0;
FT_Error error;
+
/* First of all, allocate the library object */
if ( ALLOC( library, sizeof ( *library ) ) )
return error;
@@ -513,7 +586,8 @@
0,
0
};
-
+
+
error = FT_Add_Glyph_Format( library, &outline_format );
}
@@ -537,7 +611,7 @@
/* library :: A handle to the target library */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
EXPORT_FUNC
FT_Error FT_Done_Library( FT_Library library )
@@ -552,7 +626,7 @@
memory = library->memory;
/* Discard client-data */
- if( library->generic.finalizer )
+ if ( library->generic.finalizer )
library->generic.finalizer( library );
/* Close all drivers in the library */
@@ -560,6 +634,7 @@
{
FT_Driver driver = library->drivers[n];
+
if ( driver )
{
Destroy_Driver( driver );
@@ -569,11 +644,12 @@
/* Destroy raster object */
FREE( library->raster_pool );
-
+
{
- FT_Glyph_Format* cur = library->glyph_formats;
+ FT_Glyph_Format* cur = library->glyph_formats;
FT_Glyph_Format* limit = cur + FT_MAX_GLYPH_FORMATS;
-
+
+
for ( ; cur < limit; cur++ )
{
if ( cur->raster_allocated )
@@ -596,15 +672,18 @@
/* 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. */
/* */
EXPORT_FUNC
FT_Error FT_Set_Raster_Mode( FT_Library library,
@@ -616,13 +695,15 @@
FT_Error error;
FT_Glyph_Format* format = 0;
+
{
FT_Glyph_Format* cur = library->glyph_formats;
FT_Glyph_Format* limit = cur + FT_MAX_GLYPH_FORMATS;
-
- for (; cur < limit; cur++)
+
+
+ for ( ; cur < limit; cur++ )
{
- if (cur->format_tag == format_tag)
+ if ( cur->format_tag == format_tag )
{
format = cur;
break;
@@ -630,14 +711,15 @@
}
}
- if (!format)
+ if ( !format )
return FT_Err_Invalid_Argument;
memory = library->memory;
error = FT_Err_Ok;
- if (format->raster)
- error = format->raster_interface->set_mode( format->raster, mode, args );
+ if ( format->raster )
+ error = format->raster_interface->set_mode( format->raster,
+ mode, args );
return error;
}
@@ -650,16 +732,17 @@
/* */
/* <Description> */
/* Registers a new driver in a given library object. This function */
- /* takes only a pointer to a driver interface. It uses it to create */
+ /* takes only a pointer to a driver interface; it uses it to create */
/* the new driver, then sets up some important fields. */
/* */
- /* <Input> */
+ /* <InOut> */
/* library :: A handle to the target library object. */
/* */
+ /* <Input> */
/* driver_interface :: A pointer to a driver interface table. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
/* <Note> */
/* This function doesn't check whether the driver is already */
@@ -673,6 +756,7 @@
FT_Driver driver;
FT_Memory memory;
+
if ( !library || !driver_interface )
return FT_Err_Invalid_Library_Handle;
@@ -690,10 +774,11 @@
driver->memory = memory;
driver->interface = *driver_interface;
- if (driver_interface->init_driver)
+ if ( driver_interface->init_driver )
{
error = driver_interface->init_driver( driver );
- if ( error ) goto Fail;
+ if ( error )
+ goto Fail;
}
library->drivers[library->num_drivers++] = driver;
@@ -714,7 +799,7 @@
/* FT_Remove_Driver */
/* */
/* <Description> */
- /* Unregister a given driver. This closes the driver, which in turn */
+ /* Unregisters a given driver. This closes the driver, which in turn */
/* destroys all faces, sizes, slots, etc. associated with it. */
/* */
/* This function also DESTROYS the driver object. */
@@ -723,7 +808,7 @@
/* driver :: A handle to target driver object. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
EXPORT_FUNC
FT_Error FT_Remove_Driver( FT_Driver driver )
@@ -756,7 +841,7 @@
Destroy_Driver( driver );
/* now move the last driver in the table to the vacant slot */
- if (cur < last)
+ if ( cur < last )
{
*cur = *last;
*last = 0;
@@ -778,25 +863,26 @@
/* FT_Get_Driver */
/* */
/* <Description> */
- /* returns the handle of the driver responsible for a given format */
+ /* Returns the handle of the driver responsible for a given format */
/* (or service) according to its `name'. */
/* */
/* <Input> */
- /* library :: handle to library object. */
- /* driver_name :: name of driver to look-up. */
+ /* library :: A handle to the library object. */
+ /* driver_name :: The name of the driver to look up. */
/* */
/* <Return> */
- /* handle to driver object. 0 otherwise */
+ /* A handle to the driver object, 0 otherwise. */
/* */
EXPORT_FUNC
FT_Driver FT_Get_Driver( FT_Library library,
char* driver_name )
{
FT_Driver *cur, *limit;
-
- if (!library || !driver_name)
+
+
+ if ( !library || !driver_name )
return 0;
-
+
cur = library->drivers;
limit = cur + library->num_drivers;
for ( ; cur < limit; cur++ )
@@ -808,7 +894,6 @@
}
-
static
FT_Error open_face( FT_Driver driver,
FT_Stream stream,
@@ -868,7 +953,7 @@
/* face :: A handle to a new face object. */
/* */
/* <Return> */
- /* Error code. 0 means success. */
+ /* FreeType error code. 0 means success. */
/* */
/* <Note> */
/* Unlike FreeType 1.1, this function automatically creates a glyph */
@@ -894,29 +979,31 @@
FT_Stream stream;
FT_Memory memory;
FT_Error error;
-
+
+
memory = library->memory;
- if ( ALLOC( stream, sizeof(*stream) ) )
+ if ( ALLOC( stream, sizeof ( *stream ) ) )
goto Fail;
-
+
stream->memory = memory;
-
+
error = FT_New_Stream( pathname, stream );
if (error) goto Fail_Stream;
-
+
error = FT_Open_Face( library, stream, face_index, aface );
- if (!error)
+ if ( !error )
return error;
/* close stream in case of error */
stream->close( stream );
-
+
Fail_Stream:
- FREE(stream);
+ FREE( stream );
Fail:
return error;
}
+
EXPORT_FUNC
FT_Error FT_New_Memory_Face( FT_Library library,
void* file_base,
@@ -927,15 +1014,15 @@
FT_Stream stream;
FT_Memory memory;
FT_Error error;
-
+
memory = library->memory;
if ( ALLOC( stream, sizeof(*stream) ) )
goto Fail;
-
+
stream->memory = memory;
-
+
FT_New_Memory_Stream( library, (void*)file_base, file_size, stream );
-
+
error = FT_Open_Face( library, stream, face_index, face );
if (!error)
return error;
@@ -945,7 +1032,7 @@
return error;
}
-
+
EXPORT_FUNC
FT_Error FT_Open_Face( FT_Library library,
FT_Stream stream,
@@ -967,8 +1054,8 @@
{
/* check each font driver for an appropriate format */
- FT_Driver* cur = library->drivers;
- FT_Driver* limit = cur + library->num_drivers;
+ FT_Driver* cur = library->drivers;
+ FT_Driver* limit = cur + library->num_drivers;
for ( ; cur < limit; cur++ )
{
@@ -1019,7 +1106,7 @@
error = FT_New_GlyphSlot( face, &slot );
if ( error ) goto Fail;
}
-
+
/****************************************************************/
/* finally allocate a size object for the face */
{
@@ -1029,7 +1116,7 @@
error = FT_New_Size( face, &size );
if ( error ) goto Fail;
}
-
+
*aface = face;
goto Exit;
@@ -1037,7 +1124,7 @@
FT_Done_Face( face );
Bad_Resource:
-
+
Exit:
FT_TRACE4(( "FT_Open_Face: Return %d\n", error ));
return error;
@@ -1148,7 +1235,7 @@
*asize = size;
node->data = size;
FT_List_Add( &face->sizes_list, node );
-
+
/* record as current size for the face */
face->size = size;
}
@@ -1259,13 +1346,13 @@
if (!char_width)
char_width = char_height;
-
+
else if (!char_height)
char_height = char_width;
-
+
if (!horz_resolution)
horz_resolution = 72;
-
+
if (!vert_resolution)
vert_resolution = 72;
@@ -1367,7 +1454,7 @@
goto Exit;
slot->face = face;
-
+
slot->max_subglyphs = 0;
slot->num_subglyphs = 0;
slot->subglyphs = 0;
@@ -1497,13 +1584,13 @@
FT_Error error;
FT_Driver driver;
FT_UInt glyph_index;
-
+
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)
error = FT_Err_Invalid_Character_Code;
else
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index f6f9160..20be50c 100644
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c
@@ -107,17 +107,17 @@
{
FT_Error error;
FT_Glyph_Format* format;
-
+
error = FT_Err_Invalid_Glyph_Format;
format = FT_Get_Glyph_Format( library, ft_glyph_format_outline );
if (!format) goto Exit;
-
+
error = FT_Err_Invalid_Glyph_Format;
if (!format->raster) goto Exit;
error = format->raster_interface->render( format->raster, outline, map );
Exit:
- return error;
+ return error;
}
diff --git a/src/base/ftraster.c b/src/base/ftraster.c
index cad126d..e5eb7e9 100644
--- a/src/base/ftraster.c
+++ b/src/base/ftraster.c
@@ -683,7 +683,7 @@
x = ras.cursor[-1];
- switch ( ras.cur_prof->flow )
+ switch ( ras.cur_prof->flow )
{
case FT_Flow_Up:
o = Vio_ScanLineWidth *
@@ -1202,7 +1202,7 @@
Ix --;
Rx += Dy;
}
-
+
Ax = -Dy;
Rx <<= 1;
Dy <<= 1;
@@ -1332,7 +1332,7 @@
e = CEILING( y1 ); /* integer start y == current scanline */
f1 = FRAC( y1 ); /* fractional shift of start y */
e0 = e; /* first integer scanline to be pushed */
-
+
if ( f1 == 0 ) /* do we start on an integer scanline? */
{
if ( ras.joint )
@@ -1381,7 +1381,7 @@
if ( y2 > e ) /* the arc intercepts the current scanline */
{
y1 = arc[degree].y; /* start y of top-most arc */
-
+
if ( y2 - y1 >= ras.precision_step )
{
/* if the arc's height is too great, split it */
@@ -1726,7 +1726,7 @@
{
TPos scaled_x, scaled_y;
-
+
/* if there was already a contour being built, perform some checks */
if ( ras.start_prof )
if ( Check_Contour( RAS_VAR ) )
@@ -1735,7 +1735,7 @@
/* set the `current last point' */
scaled_x = SCALED( to->x );
scaled_y = SCALED( to->y );
-
+
if ( ras.flipped )
{
ras.last.x = scaled_y;
@@ -1803,7 +1803,7 @@
if ( ras.state != new_state )
- {
+ {
if ( ras.state != Unknown &&
End_Profile( RAS_VAR ) )
goto Fail;
@@ -1811,7 +1811,7 @@
if ( New_Profile( RAS_VAR_ new_state ) )
goto Fail;
}
- }
+ }
/* Then compute the lines */
switch ( ras.state )
@@ -1896,7 +1896,7 @@
ymin = y3;
ymax = y1;
}
-
+
if ( y2 < ymin || y2 > ymax )
{
/* this arc has no given direction, split it !! */
@@ -1919,12 +1919,12 @@
if ( ras.state != Unknown &&
End_Profile( RAS_VAR ) )
goto Fail;
-
+
/* create a new profile */
if ( New_Profile( RAS_VAR_ state_bez ) )
goto Fail;
}
-
+
/* now call the appropriate routine */
if ( state_bez == Ascending )
{
@@ -1934,7 +1934,7 @@
else
if ( Bezier_Down( RAS_VAR_ 2, Split_Conic, ras.minY, ras.maxY ) )
goto Fail;
- }
+ }
} while ( ras.arc >= ras.arcs );
@@ -2023,7 +2023,7 @@
ymin1 = y4;
ymax1 = y1;
}
-
+
if ( y2 <= y3 )
{
ymin2 = y2;
@@ -2034,7 +2034,7 @@
ymin2 = y3;
ymax2 = y2;
}
-
+
if ( ymin2 < ymin1 || ymax2 > ymax1 )
{
/* this arc has no given direction, split it! */
@@ -2045,11 +2045,11 @@
{
/* this arc is flat, ignore it and pop it from the bezier stack */
ras.arc -= 3;
- }
+ }
else
{
state_bez = ( y1 <= y4 ) ? Ascending : Descending;
-
+
/* detect a change of direction */
if ( ras.state != state_bez )
{
@@ -2616,11 +2616,11 @@
void Vertical_Sweep_Init( RAS_ARG_ int* min, int* max )
{
long pitch;
-
+
UNUSED( max );
pitch = ras.target.pitch;
-
+
/* start from the bottom line, going up !! */
ras.trace_bit = - *min * pitch;
ras.trace_incr = -pitch;
@@ -2874,10 +2874,10 @@
{
long pitch = ras.target.pitch;
long offset = - pitch * e1;
-
+
if (pitch > 0)
offset += (ras.target.rows-1)*pitch;
-
+
bits[offset] |= f1;
}
}
@@ -2906,10 +2906,10 @@
int f1 = (Byte)(0x80 >> (y & 7));
long pitch = ras.target.pitch;
long offset = - pitch * x;
-
+
if (pitch > 0)
offset += (ras.target.rows-1)*pitch;
-
+
return ( x >= 0 && x < ras.target.rows && (bits[0] & f1) );
}
@@ -2943,9 +2943,9 @@
{
long pitch = ras.target.pitch;
long offset = - x*pitch;
-
+
if (pitch > 0)
- offset += (ras.target.rows-1)*pitch;
+ offset += (ras.target.rows-1)*pitch;
bits[offset] |= f1;
}
@@ -3009,15 +3009,15 @@
void Vertical_Gray_Sweep_Init( RAS_ARG_ int* min, int* max )
{
long pitch;
-
+
UNUSED( max );
pitch = ras.target.pitch;
-
+
/* start from the bottom line, going up */
ras.trace_incr = -pitch;
ras.trace_bit = - *min * pitch;
-
+
if (pitch > 0)
ras.trace_bit += (ras.target.rows-1)*pitch;
}
@@ -3050,15 +3050,15 @@
x1 += ras.precision_half;
x2 += ras.precision_half;
-
-#ifdef FT_RASTER_OPTION_CONTRAST
+
+#ifdef FT_RASTER_OPTION_CONTRAST
if ( x2-x1 < ras.precision )
{
x1 = ((x1+x2) >> 1) - ras.precision_half;
x2 = x1 + ras.precision;
}
#endif
-
+
e1 = TRUNC( x1 );
e2 = TRUNC( x2 );
@@ -3081,7 +3081,7 @@
target = ras.bit_buffer + ras.trace_bit + e1;
e2 -= e1;
-
+
if ( e2 > 0 )
{
if (x1 > 0) target[0] += (Byte)(64-x1) << 1;
@@ -3124,7 +3124,7 @@
#if 0
/* as a rule of thumb, do not add a drop-out if the current */
/* gray level is over 0.5 */
-
+
return ( x >= 0 && x < ras.bit_width &&
ras.bit_buffer[ras.trace_bit + x] >= 64 );
#else
@@ -3158,9 +3158,9 @@
if ( x >= 0 && x < ras.bit_width )
{
unsigned char* pixel;
-
+
pixel = ras.bit_buffer + ras.trace_bit + x;
-
+
/* do not add too much to the pixel gray level */
color += *pixel;
if (color < 64)
@@ -3267,14 +3267,14 @@
x1 += ras.precision_half;
x2 += ras.precision_half;
-#ifdef FT_RASTER_OPTION_CONTRAST
+#ifdef FT_RASTER_OPTION_CONTRAST
if (x2-x1 < ras.precision)
{
x1 = ((x1+x2) >> 1) - ras.precision_half;
x2 = x1 + ras.precision;
}
#endif
-
+
e1 = TRUNC( x1 );
e2 = TRUNC( x2 );
@@ -3299,16 +3299,16 @@
bits = ras.bit_buffer + y;
bits += incr * e1;
if (incr < 0)
- bits -= incr*(ras.target.rows-1);
+ bits -= incr*(ras.target.rows-1);
e2 -= e1;
-
+
if ( e2 > 0 )
{
b = bits[0];
if (b < 127) b++;
bits[0] = (64-x1) + (b >> 1);
-
+
if ( ras.precision > 64 )
{
e2--;
@@ -3316,16 +3316,16 @@
{
bits += incr;
b = bits[0];
-
+
if (b < 127)
- bits[0] = (Byte)(63+((b+1) >> 1));
-
+ bits[0] = (Byte)(63+((b+1) >> 1));
+
e2--;
}
}
else
bits += incr*(e2-1);
-
+
if (x2)
{
bits += incr;
@@ -3403,10 +3403,10 @@
if ( x >= 0 && x < ras.target.rows )
{
long pitch = ras.target.pitch;
-
+
pixel -= pitch*x;
if (pitch > 0)
- pixel += pitch*(ras.target.rows-1);
+ pixel += pitch*(ras.target.rows-1);
color += *pixel;
if (color < 64)
@@ -4273,7 +4273,7 @@ Scan_DropOuts :
/* clear anti-alias intermediate lines */
{
char* p = raster->gray_lines;
- char* limit = p + ANTI_ALIAS_BUFFER_SIZE;
+ char* limit = p + ANTI_ALIAS_BUFFER_SIZE;
do *p++ = 0; while ( p < limit );
}
@@ -4383,10 +4383,10 @@ Scan_DropOuts :
{
sizeof( struct FT_RasterRec_ ),
ft_glyph_format_outline,
-
+
(FT_Raster_Init_Proc) FT_Raster_Init,
(FT_Raster_Set_Mode_Proc) 0,
- (FT_Raster_Render_Proc) FT_Raster_Render
+ (FT_Raster_Render_Proc) FT_Raster_Render
};
diff --git a/src/base/ftstream.c b/src/base/ftstream.c
index f373c66..c6131d5 100644
--- a/src/base/ftstream.c
+++ b/src/base/ftstream.c
@@ -26,9 +26,9 @@
FT_ULong pos )
{
FT_Error error;
-
+
stream->pos = pos;
-
+
if (stream->read)
{
if (stream->read( stream, pos, 0, 0 ))
@@ -51,30 +51,30 @@
FT_ERROR(( " invalid i/o, pos = 0x%lx, size = 0x%lx\n",
pos, stream->size ));
}
-
+
else
error = FT_Err_Ok;
-
- return error;
+
+ return error;
}
-
-
+
+
BASE_FUNC
FT_Error FT_Skip_Stream( FT_Stream stream,
FT_Long distance )
{
return FT_Seek_Stream( stream, (FT_ULong)(stream->pos + distance) );
}
-
-
-
+
+
+
BASE_FUNC
FT_Long FT_Stream_Pos( FT_Stream stream )
{
return stream->pos;
}
-
-
+
+
BASE_FUNC
FT_Error FT_Read_Stream( FT_Stream stream,
void* buffer,
@@ -82,8 +82,8 @@
{
return FT_Read_Stream_At( stream, stream->pos, buffer, count );
}
-
-
+
+
BASE_FUNC
FT_Error FT_Read_Stream_At( FT_Stream stream,
FT_ULong pos,
@@ -92,16 +92,16 @@
{
FT_Error error = FT_Err_Ok;
FT_ULong read_bytes;
-
+
if (pos >= stream->size)
{
FT_ERROR(( "FT_Read_Stream_At:" ));
FT_ERROR(( " invalid i/o, pos = 0x%lx, size = 0x%lx\n",
pos, stream->size ));
-
+
return FT_Err_Invalid_Stream_Operation;
}
-
+
if (stream->read)
read_bytes = stream->read( stream, pos, buffer, count );
else
@@ -109,10 +109,10 @@
read_bytes = stream->size - pos;
if (read_bytes > count)
read_bytes = count;
-
+
MEM_Copy( buffer, stream->base + pos, read_bytes );
}
-
+
stream->pos = pos + read_bytes;
if (read_bytes < count)
@@ -125,9 +125,9 @@
return error;
}
-
-
-
+
+
+
BASE_FUNC
FT_Error FT_Access_Frame( FT_Stream stream,
FT_ULong count )
@@ -136,25 +136,25 @@
FT_ULong read_bytes;
/* check for nested frame access */
- FT_Assert( stream && stream->cursor == 0 );
-
+ FT_Assert( stream && stream->cursor == 0 );
+
if (stream->read)
{
/* allocate the frame in memory */
FT_Memory memory = stream->memory;
-
+
if ( ALLOC( stream->base, count ) )
goto Exit;
-
+
/* read it */
read_bytes = stream->read( stream, stream->pos,
- stream->base, count );
+ stream->base, count );
if (read_bytes < count)
{
FT_ERROR(( "FT_Access_Frame:" ));
FT_ERROR(( " invalid read, expected %lu bytes, got %lu",
count, read_bytes ));
-
+
FREE( stream->base );
error = FT_Err_Invalid_Stream_Operation;
}
@@ -170,30 +170,30 @@
FT_ERROR(( "FT_Access_Frame:" ));
FT_ERROR(( " invalid i/o, pos = 0x%lx, count = %lu, size = 0x%lx",
stream->pos, count, stream->size ));
-
+
error = FT_Err_Invalid_Stream_Operation;
goto Exit;
}
-
+
/* set cursor */
- stream->cursor = stream->base + stream->pos;
+ stream->cursor = stream->base + stream->pos;
stream->limit = stream->cursor + count;
stream->pos += count;
}
Exit:
return error;
}
-
-
+
+
BASE_FUNC
void FT_Forget_Frame( FT_Stream stream )
{
FT_Assert( stream && stream->cursor != 0 );
-
+
if (stream->read)
{
FT_Memory memory = stream->memory;
-
+
FREE( stream->base );
}
stream->cursor = 0;
@@ -205,25 +205,25 @@
FT_Char FT_Get_Char( FT_Stream stream )
{
FT_Char result;
-
+
FT_Assert( stream && stream->cursor && stream->cursor );
result = 0;
- if (stream->cursor < stream->limit)
+ if (stream->cursor < stream->limit)
result = *stream->cursor++;
-
+
return result;
}
-
-
+
+
BASE_FUNC
FT_Short FT_Get_Short( FT_Stream stream )
{
char* p;
FT_Short result;
-
+
FT_Assert( stream && stream->cursor );
-
+
result = 0;
p = stream->cursor;
if (p+1 < stream->limit)
@@ -231,16 +231,16 @@
stream->cursor = p;
return result;
}
-
+
BASE_FUNC
FT_Long FT_Get_Offset( FT_Stream stream )
{
char* p;
FT_Long result;
-
+
FT_Assert( stream && stream->cursor );
-
+
result = 0;
p = stream->cursor;
if (p+2 < stream->limit)
@@ -248,35 +248,35 @@
stream->cursor = p;
return result;
}
-
+
BASE_FUNC
FT_Long FT_Get_Long( FT_Stream stream )
{
char* p;
FT_Long result;
-
+
FT_Assert( stream && stream->cursor );
- result = 0;
+ result = 0;
p = stream->cursor;
if (p+3 < stream->limit)
result = NEXT_Long(p);
stream->cursor = p;
return result;
}
-
-
+
+
BASE_FUNC
FT_Char FT_Read_Char( FT_Stream stream,
FT_Error* error )
{
char result = 0;
-
+
FT_Assert( stream );
-
+
*error = FT_Err_Ok;
-
+
if (stream->read)
{
if ( stream->read( stream, stream->pos, &result, 1L ) != 1L )
@@ -290,7 +290,7 @@
goto Fail;
}
return result;
-
+
Fail:
*error = FT_Err_Invalid_Stream_Operation;
FT_ERROR(( "FT_Read_Char:" ));
@@ -298,7 +298,7 @@
stream->pos, stream->size ));
return 0;
}
-
+
BASE_FUNC
FT_Short FT_Read_Short( FT_Stream stream,
@@ -307,25 +307,25 @@
char reads[2];
char* p = 0;
FT_Short result = 0;
-
+
FT_Assert( stream );
-
+
*error = FT_Err_Ok;
-
+
if (stream->pos+1 < stream->size)
{
if (stream->read)
{
if (stream->read( stream, stream->pos, reads, 2L ) != 2L )
goto Fail;
-
+
p = reads;
}
else
{
p = stream->base + stream->pos;
}
-
+
if (p)
{
result = NEXT_Short(p);
@@ -335,7 +335,7 @@
else goto Fail;
return result;
-
+
Fail:
*error = FT_Err_Invalid_Stream_Operation;
FT_ERROR(( "FT_Read_Short:" ));
@@ -343,7 +343,7 @@
stream->pos, stream->size ));
return 0;
}
-
+
BASE_FUNC
FT_Long FT_Read_Offset( FT_Stream stream,
@@ -352,25 +352,25 @@
char reads[3];
char* p = 0;
FT_Long result = 0;
-
+
FT_Assert( stream );
-
+
*error = FT_Err_Ok;
-
+
if (stream->pos+2 < stream->size)
{
if (stream->read)
{
if (stream->read( stream, stream->pos, reads, 3L ) != 3L )
goto Fail;
-
+
p = reads;
}
else
{
p = stream->base + stream->pos;
}
-
+
if (p)
{
result = NEXT_Offset(p);
@@ -378,9 +378,9 @@
}
}
else goto Fail;
-
+
return result;
-
+
Fail:
*error = FT_Err_Invalid_Stream_Operation;
FT_ERROR(( "FT_Read_Offset:" ));
@@ -388,7 +388,7 @@
stream->pos, stream->size ));
return 0;
}
-
+
BASE_FUNC
FT_Long FT_Read_Long( FT_Stream stream,
@@ -397,25 +397,25 @@
char reads[4];
char* p = 0;
FT_Long result = 0;
-
+
FT_Assert( stream );
-
+
*error = FT_Err_Ok;
-
+
if (stream->pos+3 < stream->size)
{
if (stream->read)
{
if (stream->read( stream, stream->pos, reads, 4L ) != 4L )
goto Fail;
-
+
p = reads;
}
else
{
p = stream->base + stream->pos;
}
-
+
if (p)
{
result = NEXT_Long(p);
@@ -425,7 +425,7 @@
else goto Fail;
return result;
-
+
Fail:
*error = FT_Err_Invalid_Stream_Operation;
FT_ERROR(( "FT_Read_Long:" ));