Commit d1b7475be1da031a6f60c229cc0c96a37e6da37e
2000-08-24T16:29:15
Formatting, small fixes. Adding basic input parameter checking for exported functions.
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 2368 2369 2370 2371
diff --git a/builds/unix/devel/freetype/config/ftoption.h b/builds/unix/devel/freetype/config/ftoption.h
index e27ed9f..19d4414 100644
--- a/builds/unix/devel/freetype/config/ftoption.h
+++ b/builds/unix/devel/freetype/config/ftoption.h
@@ -349,7 +349,7 @@
/* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine */
/* calls during glyph loading. */
/* */
-#define T1_MAX_SUBRS_CALLS 8
+#define T1_MAX_SUBRS_CALLS 16
/*************************************************************************/
@@ -357,7 +357,7 @@
/* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity. A */
/* minimum of 16 is required. */
/* */
-#define T1_MAX_CHARSTRINGS_OPERANDS 32
+#define T1_MAX_CHARSTRINGS_OPERANDS 64
/*************************************************************************/
diff --git a/builds/win32/devel/freetype/config/ftoption.h b/builds/win32/devel/freetype/config/ftoption.h
index e27ed9f..19d4414 100644
--- a/builds/win32/devel/freetype/config/ftoption.h
+++ b/builds/win32/devel/freetype/config/ftoption.h
@@ -349,7 +349,7 @@
/* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine */
/* calls during glyph loading. */
/* */
-#define T1_MAX_SUBRS_CALLS 8
+#define T1_MAX_SUBRS_CALLS 16
/*************************************************************************/
@@ -357,7 +357,7 @@
/* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity. A */
/* minimum of 16 is required. */
/* */
-#define T1_MAX_CHARSTRINGS_OPERANDS 32
+#define T1_MAX_CHARSTRINGS_OPERANDS 64
/*************************************************************************/
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
index 7be5199..e4c1000 100644
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -2,7 +2,7 @@
/* */
/* ftcache.h */
/* */
-/* FreeType Cache subsystem */
+/* FreeType Cache subsystem. */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
@@ -15,84 +15,85 @@
/* */
/***************************************************************************/
+
#ifndef FTCACHE_H
#define FTCACHE_H
#include <freetype/ftglyph.h>
+#ifdef __cplusplus
+ extern "C" {
+#endif
- /**************************************************************************/
- /**************************************************************************/
- /**************************************************************************/
- /***** *****/
- /***** BASIC TYPE DEFINITIONS *****/
- /***** *****/
- /**************************************************************************/
- /**************************************************************************/
- /**************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+ /***** *****/
+ /***** BASIC TYPE DEFINITIONS *****/
+ /***** *****/
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
- /**************************************************************************
- *
- * <Type>
- * FTC_FaceID
- *
- * <Description>
- * a generic pointer type that is used to identity face objects.
- * the content of such objects is application-dependent
- *
- **************************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FTC_FaceID */
+ /* */
+ /* <Description> */
+ /* A generic pointer type that is used to identity face objects. The */
+ /* contents of such objects is application-dependent. */
+ /* */
typedef FT_Pointer FTC_FaceID;
-
- /**************************************************************************
- *
- * <FuncType>
- * FTC_Face_Requester
- *
- * <Description>
- * a callback function provided by client applications. It is used
- * to translate a given FTC_FaceID into a new valid FT_Face object
- *
- * <Input>
- * face_id :: the face id to resolve
- * library :: handle to a FreeType library object
- * data :: application-provided request data
- *
- * <Output>
- * aface :: a new FT_Face handle
- *
- * <Return>
- * Error code. 0 means success
- *
- **************************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <FuncType> */
+ /* FTC_Face_Requester */
+ /* */
+ /* <Description> */
+ /* A callback function provided by client applications. It is used */
+ /* to translate a given FTC_FaceID into a new valid FT_Face object. */
+ /* */
+ /* <Input> */
+ /* face_id :: The face ID to resolve. */
+ /* */
+ /* library :: A handle to a FreeType library object. */
+ /* */
+ /* data :: Application-provided request data. */
+ /* */
+ /* <Output> */
+ /* aface :: A new FT_Face handle. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
typedef FT_Error (*FTC_Face_Requester)( FTC_FaceID face_id,
FT_Library library,
FT_Pointer request_data,
FT_Face* aface );
- /**************************************************************************
- *
- * <Struct>
- * FTC_SizeRec
- *
- * <Description>
- * A simple structure used to describe a given "font size" to the
- * cache manager
- *
- * <Fields>
- * face_id :: id of face to use
- * pix_width :: character width in integer pixels
- * pix_height :: character height in integer pixels
- *
- **************************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Struct> */
+ /* FTC_SizeRec */
+ /* */
+ /* <Description> */
+ /* A simple structure used to describe a given `font size' to the */
+ /* cache manager. */
+ /* */
+ /* <Fields> */
+ /* face_id :: The ID of the face to use. */
+ /* */
+ /* pix_width :: The character width in integer pixels. */
+ /* */
+ /* pix_height :: The character height in integer pixels. */
+ /* */
typedef struct FTC_SizeRec_
{
FTC_FaceID face_id;
@@ -102,232 +103,221 @@
} FTC_SizeRec;
- /**************************************************************************
- *
- * <Type>
- * FTC_SizeID
- *
- * <Description>
- * A simple handle to a FTC_SizeRec structure
- *
- **************************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FTC_SizeID */
+ /* */
+ /* <Description> */
+ /* A simple handle to a FTC_SizeRec structure. */
+ /* */
typedef FTC_SizeRec* FTC_SizeID;
-
- /**************************************************************************/
- /**************************************************************************/
- /**************************************************************************/
- /***** *****/
- /***** CACHE MANAGER OBJECT *****/
- /***** *****/
- /**************************************************************************/
- /**************************************************************************/
- /**************************************************************************/
-
-
-
-
- /**************************************************************************
- *
- * <Type>
- * FTC_Manager
- *
- * <Description>
- * This object is used to cache one or more FT_Face object, along with
- * corresponding FT_Size objects.
- *
- **************************************************************************/
-
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+ /***** *****/
+ /***** CACHE MANAGER OBJECT *****/
+ /***** *****/
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+
+
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FTC_Manager */
+ /* */
+ /* <Description> */
+ /* This object is used to cache one or more FT_Face objects, along */
+ /* with corresponding FT_Size objects. */
+ /* */
typedef struct FTC_ManagerRec_* FTC_Manager;
- /**************************************************************************
- *
- * <Function>
- * FTC_Manager_New
- *
- * <Description>
- * Create a new cache manager.
- *
- * <Input>
- * library :: the parent FreeType library handle to use
- *
- * max_faces :: maximum number of faces to keep alive in manager
- * use 0 for defaults
- *
- * max_sizes :: maximum number of sizes to keep alive in manager
- * use 0 for defaults
- *
- * requester :: an application-provided callback used to translate
- * face IDs into real FT_Face objects
- *
- * req_data :: a generic pointer that is passed to the requester
- * each time it is called (see FTC_Face_Requester)
- *
- * <Output>
- * amanager :: handle to new manager object. 0 in case of failure
- *
- * <Return>
- * Error code. 0 means success
- *
- **************************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FTC_Manager_New */
+ /* */
+ /* <Description> */
+ /* Creates a new cache manager. */
+ /* */
+ /* <Input> */
+ /* library :: The parent FreeType library handle to use. */
+ /* */
+ /* max_faces :: Maximum number of faces to keep alive in manager. */
+ /* Use 0 for defaults. */
+ /* */
+ /* max_sizes :: Maximum number of sizes to keep alive in manager. */
+ /* Use 0 for defaults. */
+ /* */
+ /* requester :: An application-provided callback used to translate */
+ /* face IDs into real FT_Face objects. */
+ /* */
+ /* req_data :: A generic pointer that is passed to the requester */
+ /* each time it is called (see FTC_Face_Requester) */
+ /* */
+ /* <Output> */
+ /* amanager :: A handle to a new manager object. 0 in case of */
+ /* failure. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
FT_EXPORT_DEF( FT_Error ) FTC_Manager_New( FT_Library library,
FT_UInt max_faces,
- FT_UInt max_sizes,
+ FT_UInt max_sizes,
FTC_Face_Requester requester,
FT_Pointer req_data,
FTC_Manager* amanager );
-
- /**************************************************************************
- *
- * <Function>
- * FTC_Manager_Reset
- *
- * <Description>
- * Empty a given cache manager. This simply gets rid of all the
- * currently cached FT_Face & FT_Size objects within the manager
- *
- * <Input>
- * manager :: handle to manager
- *
- **************************************************************************/
-
- FT_EXPORT_DEF( void ) FTC_Manager_Reset( FTC_Manager manager );
-
-
- /**************************************************************************
- *
- * <Function>
- * FTC_Manager_Done
- *
- * <Description>
- * destroys a given manager after emptying it..
- *
- * <Input>
- * manager :: handle to target cache manager object
- *
- **************************************************************************/
-
- FT_EXPORT_DEF( void ) FTC_Manager_Done( FTC_Manager manager );
-
-
- /**************************************************************************
- *
- * <Function>
- * FTC_Manager_Lookup_Face
- *
- * <Description>
- * retrieves the FT_Face that corresponds to a given face ID through
- * a cache manager.
- *
- * <Input>
- * manager :: handle to cache manager
- * face_id :: ID of face object
- *
- * <Output>
- * aface :: handle to face object
- *
- * <Return>
- * Error code. 0 means success
- *
- * <Note>
- * The returned FT_Face object is always owned by the manager, you
- * should never try to discard it yourself..
- *
- * The FT_Face object doesn't necessarily have a current size object
- * (i.e. face->size can be 0). If you need a specific "font size",
- * use FTC_Manager_Lookup_Size instead..
- *
- * Never change the face's transform (i.e. NEVER CALL FT_Set_Transform)
- * on a returned face. If you need to transform glyphs, do it yourself
- * after glyph loading..
- *
- **************************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FTC_Manager_Reset */
+ /* */
+ /* <Description> */
+ /* Empties a given cache manager. This simply gets rid of all the */
+ /* currently cached FT_Face & FT_Size objects within the manager. */
+ /* */
+ /* <Input> */
+ /* manager :: A handle to the manager. */
+ /* */
+ FT_EXPORT_DEF( void ) FTC_Manager_Reset( FTC_Manager manager );
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FTC_Manager_Done */
+ /* */
+ /* <Description> */
+ /* Destroys a given manager after emptying it. */
+ /* */
+ /* <Input> */
+ /* manager :: A handle to the target cache manager object. */
+ /* */
+ FT_EXPORT_DEF( void ) FTC_Manager_Done( FTC_Manager manager );
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FTC_Manager_Lookup_Face */
+ /* */
+ /* <Description> */
+ /* Retrieves the FT_Face object that corresponds to a given face ID */
+ /* through a cache manager. */
+ /* */
+ /* <Input> */
+ /* manager :: A handle to the cache manager. */
+ /* */
+ /* face_id :: The ID of the face object. */
+ /* */
+ /* <Output> */
+ /* aface :: A handle to the face object. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
+ /* <Note> */
+ /* The returned FT_Face object is always owned by the manager. You */
+ /* should never try to discard it yourself. */
+ /* */
+ /* The FT_Face object doesn't necessarily have a current size object */
+ /* (i.e., face->size can be 0). If you need a specific `font size', */
+ /* use FTC_Manager_Lookup_Size() instead. */
+ /* */
+ /* Never change the face's transformation matrix (i.e., never call */
+ /* the FT_Set_Transform() function) on a returned face! If you need */
+ /* to transform glyphs, do it yourself after glyph loading. */
+ /* */
FT_EXPORT_DEF( FT_Error ) FTC_Manager_Lookup_Face( FTC_Manager manager,
FTC_FaceID face_id,
FT_Face* aface );
- /**************************************************************************
- *
- * <Function>
- * FTC_Manager_Lookup_Size
- *
- * <Description>
- * retrieves the FT_Face & FT_Size that correspond to a given
- * FTC_SizeID
- *
- * <Input>
- * manager :: handle to cache manager.
- * size_id :: ID of the "font size" to use
- *
- * <InOut>
- * aface :: ptr to handle to face object. Set to 0 if you don't need it
- * asize :: ptr to handle to size object. Set to 0 if you don't need it
- *
- * <Return>
- * Error code. 0 means success
- *
- * <Note>
- * The returned FT_Face object is always owned by the manager, you
- * should never try to discard it yourself..
- *
- * Never change the face's transform (i.e. NEVER CALL FT_Set_Transform)
- * on a returned face. If you need to transform glyphs, do it yourself
- * after glyph loading..
- *
- * The returned FT_Size object is always owned by the manager, you
- * should never try to discard it, NEVER CHANGE ITS SETTINGS THROUGH
- * FT_Set_Pixel_Sizes OR FT_Set_Char_Size !!
- *
- * The returned size object is the face's current size, which means
- * that you can call FT_Load_Glyph with the face if you need to..
- *
- **************************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FTC_Manager_Lookup_Size */
+ /* */
+ /* <Description> */
+ /* Retrieves the FT_Face & FT_Size objects that correspond to a given */
+ /* FTC_SizeID. */
+ /* */
+ /* <Input> */
+ /* manager :: A handle to the cache manager. */
+ /* */
+ /* size_id :: The ID of the `font size' to use. */
+ /* */
+ /* <InOut> */
+ /* aface :: A pointer to the handle of the face object. Set it to */
+ /* zero if you don't need it. */
+ /* */
+ /* asize :: A pointer to the handle of the size object. Set it to */
+ /* zero if you don't need it. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
+ /* <Note> */
+ /* The returned FT_Face object is always owned by the manager. You */
+ /* should never try to discard it yourself. */
+ /* */
+ /* Never change the face's transformation matrix (i.e., never call */
+ /* the FT_Set_Transform() function) on a returned face! If you need */
+ /* to transform glyphs, do it yourself after glyph loading. */
+ /* */
+ /* Similarly, the returned FT_Size object is always owned by the */
+ /* manager. You should never try to discard it, and never change its */
+ /* settings with FT_Set_Pixel_Sizes() or FT_Set_Char_Size()! */
+ /* */
+ /* The returned size object is the face's current size, which means */
+ /* that you can call FT_Load_Glyph() with the face if you need to. */
+ /* */
FT_EXPORT_DEF( FT_Error ) FTC_Manager_Lookup_Size( FTC_Manager manager,
FTC_SizeID size_id,
FT_Face* aface,
FT_Size* asize );
- /**************************************************************************/
- /**************************************************************************/
- /**************************************************************************/
- /***** *****/
- /***** IMAGE CACHE OBJECT *****/
- /***** *****/
- /**************************************************************************/
- /**************************************************************************/
- /**************************************************************************/
-
-
- /**************************************************************************
- *
- * <Enum>
- * FTC_Image_Type
- *
- * <Description>
- * An enumeration used to list the types of glyph images found in a
- * glyph image cache.
- *
- * <Fields>
- * ftc_image_mono :: monochrome bitmap glyphs
- * ftc_image_grays :: anti-aliased bitmap glyphs
- * ftc_image_outline :: scaled (and hinted) outline glyphs
- * ftc_master_outline :: unscaled original outline glyphs
- *
- * <Note>
- * other types may be defined in the future
- *
- **************************************************************************/
-
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+ /***** *****/
+ /***** IMAGE CACHE OBJECT *****/
+ /***** *****/
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+
+
+ /*************************************************************************/
+ /* */
+ /* <Enum> */
+ /* FTC_Image_Type */
+ /* */
+ /* <Description> */
+ /* An enumeration used to list the types of glyph images found in a */
+ /* glyph image cache. */
+ /* */
+ /* <Fields> */
+ /* ftc_image_mono :: Monochrome bitmap glyphs. */
+ /* */
+ /* ftc_image_grays :: Anti-aliased bitmap glyphs. */
+ /* */
+ /* ftc_image_outline :: Scaled (and hinted) outline glyphs. */
+ /* */
+ /* ftc_master_outline :: Unscaled original outline glyphs. */
+ /* */
+ /* <Note> */
+ /* Other types may be defined in the future. */
+ /* */
typedef enum FTC_Image_Type_
{
ftc_image_mono = 0, /* monochrome bitmap */
@@ -338,21 +328,21 @@
} FTC_Image_Type;
- /**************************************************************************
- *
- * <Struct>
- * FTC_Image_Desc
- *
- * <Description>
- * A simple structure used to describe a given glyph image category
- *
- * <Fields>
- * size :: a FTC_SizeRec used to describe the glyph's face & size
- * image_type :: the glyph image's type
- *
- **************************************************************************/
-
- typedef struct FTC_Image_Desc_
+ /*************************************************************************/
+ /* */
+ /* <Struct> */
+ /* FTC_Image_Desc */
+ /* */
+ /* <Description> */
+ /* A simple structure used to describe a given glyph image category. */
+ /* */
+ /* <Fields> */
+ /* size :: An FTC_SizeRec used to describe the glyph's face & */
+ /* size. */
+ /* */
+ /* image_type :: The glyph image's type. */
+ /* */
+ typedef struct FTC_Image_Desc_
{
FTC_SizeRec size;
FT_UInt image_type;
@@ -360,95 +350,89 @@
} FTC_Image_Desc;
-
- /**************************************************************************
- *
- * <Type>
- * FTC_Image_Cache
- *
- * <Description>
- * A handle to an glyph image cache object.. They are designed to
- * hold many distinct glyph images, while not exceeding a certain
- * memory threshold..
- *
- **************************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FTC_Image_Cache */
+ /* */
+ /* <Description> */
+ /* A handle to an glyph image cache object. They are designed to */
+ /* hold many distinct glyph images, while not exceeding a certain */
+ /* memory threshold. */
+ /* */
typedef struct FTC_Image_CacheRec_* FTC_Image_Cache;
-
- /**************************************************************************
- *
- * <Function>
- * FTC_Image_Cache_New
- *
- * <Description>
- * Create a new glyph image cache.
- *
- * <Input>
- * manager :: parent manager for the image cache
- *
- * max_bytes :: the maximum amount of memory that will be used to
- * store glyph images
- *
- * <Output>
- * acache :: handle to new glyph image cache object
- *
- * <Return>
- * Error code. 0 means success
- *
- **************************************************************************/
-
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FTC_Image_Cache_New */
+ /* */
+ /* <Description> */
+ /* Creates a new glyph image cache. */
+ /* */
+ /* <Input> */
+ /* manager :: The parent manager for the image cache. */
+ /* */
+ /* max_bytes :: The maximum amount of memory that will be used to */
+ /* store glyph images. */
+ /* */
+ /* <Output> */
+ /* acache :: A handle to the new glyph image cache object. */
+ /* */
+ /* <Return> */
+ /* FreeType error code. 0 means success. */
+ /* */
FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_New( FTC_Manager manager,
FT_ULong max_bytes,
FTC_Image_Cache* acache );
- /**************************************************************************
- *
- * <Function>
- * FTC_Image_Cache_Done
- *
- * <Description>
- * Destroys a given glyph image cache (and all glyphs within it).
- *
- * <Input>
- * manager :: parent manager for the image cache
- *
- **************************************************************************/
-
- FT_EXPORT_DEF( void ) FTC_Image_Cache_Done( FTC_Image_Cache cache );
-
-
- /**************************************************************************
- *
- * <Function>
- * FTC_Image_Cache_Lookup
- *
- * <Description>
- * Retrieve a given glyph image from a glyph image cache.
- *
- * <Input>
- * cache :: handle to source glyph image cache
- * desc :: pointer to a glyph image descriptor
- * gindex :: index of glyph to retrieve
- *
- * <Output>
- * aglyph :: the corresponding FT_Glyph object. 0 in case of failure
- *
- * <Return>
- * Error code. 0 means success
- *
- * <Note>
- * the returned glyph is owned and manager by the glyph image cache,
- * never try to transform or discard it manually. You can however
- * create a copy with FT_Glyph_Copy and modify the new one at will.
- *
- * Because the glyph image cache limits the total amount of memory
- * taken by the glyphs it holds, the returned glyph might disappear
- * on a later invocation of this function !! It's a cache after all ;-)
- *
- **************************************************************************/
-
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FTC_Image_Cache_Done */
+ /* */
+ /* <Description> */
+ /* Destroys a given glyph image cache (and all glyphs within it). */
+ /* */
+ /* <Input> */
+ /* manager :: The parent manager for the image cache. */
+ /* */
+ FT_EXPORT_DEF( void ) FTC_Image_Cache_Done( FTC_Image_Cache cache );
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FTC_Image_Cache_Lookup */
+ /* */
+ /* <Description> */
+ /* Retrieves a given glyph image from a glyph image cache. */
+ /* */
+ /* <Input> */
+ /* cache :: A handle to the source glyph image cache. */
+ /* */
+ /* desc :: A pointer to a glyph image descriptor. */
+ /* */
+ /* gindex :: The glyph index to retrieve. */
+ /* */
+ /* <Output> */
+ /* aglyph :: The corresponding FT_Glyph object. 0 in case of */
+ /* failure. */
+ /* */
+ /* <Return> */
+ /* FreType error code. 0 means success. */
+ /* */
+ /* <Note> */
+ /* the returned glyph is owned and manager by the glyph image cache. */
+ /* Never try to transform or discard it manually! You can however */
+ /* create a copy with FT_Glyph_Copy() and modify the new one. */
+ /* */
+ /* Because the glyph image cache limits the total amount of memory */
+ /* taken by the glyphs it holds, the returned glyph might disappear */
+ /* on a later invocation of this function! It's a cache after all ;-) */
+ /* */
FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_Lookup(
FTC_Image_Cache cache,
FTC_Image_Desc* desc,
@@ -456,4 +440,12 @@
FT_Glyph* aglyph );
+#ifdef __cplusplus
+ }
+#endif
+
+
#endif /* FTCACHE_H */
+
+
+/* END */
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index eea3931..0e70de4 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -134,7 +134,7 @@
/*************************************************************************/
/*************************************************************************/
- typedef struct T1_Parser_ T1_Parser;
+ typedef struct T1_Parser_ T1_Parser;
/* simple enumeration type used to identify token types */
typedef enum T1_Token_Type_
@@ -189,33 +189,34 @@
} T1_Field_Location;
- typedef void (*T1_Field_Parser)( FT_Face face,
- FT_Pointer parser );
+
+ typedef void (*T1_Field_Parser)( FT_Face face,
+ FT_Pointer parser );
/* structure type used to model object fields */
typedef struct T1_Field_
{
- const char* ident; /* field identifier */
- T1_Field_Location location;
- T1_Field_Type type; /* type of field */
- T1_Field_Parser reader;
- FT_UInt offset; /* offset of field in object */
- FT_Byte size; /* size of field in bytes */
- FT_UInt array_max; /* maximal number of elements for */
- /* array */
- FT_UInt count_offset; /* offset of element count for */
- /* arrays */
+ const char* ident; /* field identifier */
+ T1_Field_Location location;
+ T1_Field_Type type; /* type of field */
+ T1_Field_Parser reader;
+ FT_UInt offset; /* offset of field in object */
+ FT_Byte size; /* size of field in bytes */
+ FT_UInt array_max; /* maximal number of elements for */
+ /* array */
+ FT_UInt count_offset; /* offset of element count for */
+ /* arrays */
} T1_Field;
#define T1_NEW_SIMPLE_FIELD( _ident, _type, _fname ) \
- { \
- _ident, T1CODE, _type, \
- 0, \
- FT_FIELD_OFFSET( _fname ), \
- FT_FIELD_SIZE( _fname ), \
- 0, 0 \
+ { \
+ _ident, T1CODE, _type, \
+ 0, \
+ FT_FIELD_OFFSET( _fname ), \
+ FT_FIELD_SIZE( _fname ), \
+ 0, 0 \
},
#define T1_NEW_CALLBACK_FIELD( _ident, _reader ) \
@@ -227,22 +228,22 @@
},
#define T1_NEW_TABLE_FIELD( _ident, _type, _fname, _max ) \
+ { \
+ _ident, T1CODE, _type, \
+ 0, \
+ FT_FIELD_OFFSET( _fname ), \
+ FT_FIELD_SIZE_DELTA( _fname ), \
+ _max, \
+ FT_FIELD_OFFSET( num_ ## _fname ) \
+ },
+
+#define T1_NEW_TABLE_FIELD2( _ident, _type, _fname, _max ) \
{ \
_ident, T1CODE, _type, \
0, \
FT_FIELD_OFFSET( _fname ), \
FT_FIELD_SIZE_DELTA( _fname ), \
- _max, \
- FT_FIELD_OFFSET( num_ ## _fname ) \
- },
-
-#define T1_NEW_TABLE_FIELD2( _ident, _type, _fname, _max ) \
- { \
- _ident, T1CODE, _type, \
- 0, \
- FT_FIELD_OFFSET( _fname ), \
- FT_FIELD_SIZE_DELTA( _fname ), \
- _max, 0 \
+ _max, 0 \
},
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 582a0a5..f3f7625 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -1019,9 +1019,9 @@
slot->advance.y = 0;
}
- if ((load_flags & FT_LOAD_NO_RECURSE)==0)
+ if ( ( load_flags & FT_LOAD_NO_RECURSE ) == 0 )
{
- /* now, transform the glyph image when needed */
+ /* now, transform the glyph image if needed */
if ( face->transform_flags )
{
/* get renderer */
diff --git a/src/cache/ftcache.c b/src/cache/ftcache.c
index a56e476..cdd7899 100644
--- a/src/cache/ftcache.c
+++ b/src/cache/ftcache.c
@@ -2,9 +2,9 @@
/* */
/* ftcache.c */
/* */
-/* The FreeType Caching sub-system */
+/* The FreeType Caching sub-system (body only). */
/* */
-/* Copyright 1996-2000 by */
+/* Copyright 2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/cache/ftcimage.c b/src/cache/ftcimage.c
index a27ed33..761703e 100644
--- a/src/cache/ftcimage.c
+++ b/src/cache/ftcimage.c
@@ -2,7 +2,7 @@
/* */
/* ftcimage.c */
/* */
-/* FreeType Image Cache */
+/* FreeType Image Cache (body). */
/* */
/* Copyright 2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
@@ -21,29 +21,30 @@
#include <freetype/internal/ftobjs.h>
#include <freetype/internal/ftlist.h>
- /***********************************************************************/
- /***********************************************************************/
- /***** *****/
- /***** IMAGE NODE MANAGEMENT *****/
- /***** *****/
- /***** For now, we simply ALLOC/FREE the FTC_ImageNode. However, *****/
- /***** it certainly is a good idea to use a chunk manager in the *****/
- /***** future in order to reduce memory waste/fragmentation *****/
- /***** *****/
- /***********************************************************************/
- /***********************************************************************/
+ /**************************************************************************/
+ /**************************************************************************/
+ /***** *****/
+ /***** IMAGE NODE MANAGEMENT *****/
+ /***** *****/
+ /***** For now, we simply ALLOC/FREE the FTC_ImageNode. However, it *****/
+ /***** certainly is a good idea to use a chunk manager in the future *****/
+ /***** in order to reduce memory waste resp. fragmentation. *****/
+ /***** *****/
+ /**************************************************************************/
+ /**************************************************************************/
static
- FT_Error FTC_ImageNode_New( FTC_Image_Cache cache,
- FTC_ImageNode *anode )
+ FT_Error FTC_ImageNode_New( FTC_Image_Cache cache,
+ FTC_ImageNode* anode )
{
FT_Error error;
FT_Memory memory = cache->memory;
FTC_ImageNode node;
+
*anode = 0;
- if (!ALLOC( node, sizeof(*node) ))
+ if ( !ALLOC( node, sizeof ( *node ) ) )
*anode = node;
return error;
@@ -51,24 +52,25 @@
static
- void FTC_ImageNode_Done( FTC_Image_Cache cache,
- FTC_ImageNode node )
+ void FTC_ImageNode_Done( FTC_Image_Cache cache,
+ FTC_ImageNode node )
{
- /* for now, we simply discard the node. We may later add a chunk */
- /* manager to the image cache.. */
+ /* for now, we simply discard the node; we may later add a chunk */
+ /* manager to the image cache. */
FT_Memory memory = cache->memory;
+
+
FREE( node );
}
-
- /***********************************************************************/
- /***********************************************************************/
- /***** *****/
- /***** GLYPH IMAGE QUEUES *****/
- /***** *****/
- /***********************************************************************/
- /***********************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+ /***** *****/
+ /***** GLYPH IMAGE QUEUES *****/
+ /***** *****/
+ /*************************************************************************/
+ /*************************************************************************/
static
@@ -324,19 +326,20 @@
static
- FT_Error FTC_Image_Queue_New( FTC_Image_Cache cache,
- FTC_Image_Desc* desc,
- FTC_Image_Queue *aqueue )
+ FT_Error FTC_Image_Queue_New( FTC_Image_Cache cache,
+ FTC_Image_Desc* desc,
+ FTC_Image_Queue* aqueue )
{
FT_Error error;
- FT_Memory memory = cache->memory;
+ FT_Memory memory = cache->memory;
FTC_Manager manager = cache->manager;
- FTC_Image_Queue queue = 0;
+ FTC_Image_Queue queue = 0;
- const FTC_Image_Class* clazz;
+ const FTC_Image_Class* clazz;
+
*aqueue = 0;
- if ( ALLOC( queue, sizeof(*queue) ) )
+ if ( ALLOC( queue, sizeof ( *queue ) ) )
goto Exit;
queue->cache = cache;
@@ -348,34 +351,35 @@
if ( ALLOC_ARRAY( queue->buckets, queue->hash_size, FT_ListRec ) )
goto Exit;
- switch (desc->image_type)
+ switch ( desc->image_type )
{
- case ftc_image_mono:
- clazz = &ftc_mono_image_class;
- break;
+ case ftc_image_mono:
+ clazz = &ftc_mono_image_class;
+ break;
- case ftc_image_grays:
- clazz = &ftc_gray_image_class;
- break;
+ case ftc_image_grays:
+ clazz = &ftc_gray_image_class;
+ break;
- case ftc_image_outline:
- clazz = &ftc_outline_image_class;
- break;
+ case ftc_image_outline:
+ clazz = &ftc_outline_image_class;
+ break;
- case ftc_image_master_outline:
- clazz = &ftc_master_outline_image_class;
- break;
+ case ftc_image_master_outline:
+ clazz = &ftc_master_outline_image_class;
+ break;
- default:
- /* invalid image type !! */
- error = FT_Err_Invalid_Argument;
- goto Exit;
+ default:
+ /* invalid image type! */
+ error = FT_Err_Invalid_Argument;
+ goto Exit;
}
queue->clazz = (FTC_Image_Class*)clazz;
*aqueue = queue;
+
Exit:
- if (error)
+ if ( error )
FREE( queue );
return error;
@@ -383,7 +387,7 @@
static
- void FTC_Image_Queue_Done( FTC_Image_Queue queue )
+ void FTC_Image_Queue_Done( FTC_Image_Queue queue )
{
FTC_Image_Cache cache = queue->cache;
FT_List glyphs_lru = &cache->glyphs_lru;
@@ -391,6 +395,7 @@
FT_List bucket_limit = bucket + queue->hash_size;
FT_Memory memory = cache->memory;
+
/* for each bucket, free the list of image nodes */
for ( ; bucket < bucket_limit; bucket++ )
{
@@ -399,11 +404,12 @@
FT_ListNode lrunode;
FTC_ImageNode inode;
+
for ( ; node; node = next )
{
next = node->next;
inode = (FTC_ImageNode)node;
- lrunode = FTC_IMAGENODE_TO_LISTNODE(inode);
+ lrunode = FTC_IMAGENODE_TO_LISTNODE( inode );
queue->clazz->done_image( queue, inode );
FT_List_Remove( glyphs_lru, lrunode );
@@ -413,6 +419,7 @@
bucket->head = bucket->tail = 0;
}
+
FREE( queue->buckets );
FREE( queue );
}
@@ -421,7 +428,7 @@
static
FT_Error FTC_Image_Queue_Lookup_Node( FTC_Image_Queue queue,
FT_UInt glyph_index,
- FTC_ImageNode *anode )
+ FTC_ImageNode* anode )
{
FTC_Image_Cache cache = queue->cache;
FT_UInt hash_index = glyph_index % queue->hash_size;
@@ -430,14 +437,15 @@
FT_Error error;
FTC_ImageNode inode;
+
*anode = 0;
for ( node = bucket->head; node; node = next )
{
inode = (FTC_ImageNode)node;
- if ( FTC_IMAGENODE_GET_GINDEX(inode) == glyph_index )
+ if ( FTC_IMAGENODE_GET_GINDEX( inode ) == glyph_index )
{
- /* we found it !! - move glyph to start of the list */
+ /* we found it! -- move glyph to start of the list */
FT_List_Up( bucket, node );
*anode = inode;
return 0;
@@ -446,14 +454,14 @@
/* we didn't found the glyph image, we will now create a new one */
error = FTC_ImageNode_New( queue->cache, &inode );
- if (error)
+ if ( error )
goto Exit;
/* set the glyph and queue indices in the image node */
FTC_IMAGENODE_SET_INDICES( inode, glyph_index, queue->index );
error = queue->clazz->init_image( queue, inode );
- if (error)
+ if ( error )
{
FTC_ImageNode_Done( queue->cache, inode );
goto Exit;
@@ -463,7 +471,7 @@
FT_List_Insert( bucket, (FT_ListNode)inode );
/* insert the node at the start the global LRU glyph list */
- FT_List_Insert( &cache->glyphs_lru, FTC_IMAGENODE_TO_LISTNODE(inode) );
+ FT_List_Insert( &cache->glyphs_lru, FTC_IMAGENODE_TO_LISTNODE( inode ) );
cache->num_bytes += queue->clazz->size_image(queue,inode);
@@ -473,31 +481,36 @@
return error;
}
-
- /***********************************************************************/
- /***********************************************************************/
- /***** *****/
- /***** IMAGE CACHE CALLBACKS *****/
- /***** *****/
- /***********************************************************************/
- /***********************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+ /***** *****/
+ /***** IMAGE CACHE CALLBACKS *****/
+ /***** *****/
+ /*************************************************************************/
+ /*************************************************************************/
-#define FTC_QUEUE_LRU_GET_CACHE(lru) ((FTC_Image_Cache)(lru)->user_data)
-#define FTC_QUEUE_LRU_GET_MANAGER(lru) FTC_QUEUE_LRU_GET_CACHE(lru)->manager
-#define FTC_LRUNODE_QUEUE(node) ((FTC_Image_Queue)(node)->root.data)
+
+#define FTC_QUEUE_LRU_GET_CACHE( lru ) \
+ ( (FTC_Image_Cache)(lru)->user_data )
+#define FTC_QUEUE_LRU_GET_MANAGER( lru ) \
+ FTC_QUEUE_LRU_GET_CACHE( lru )->manager
+#define FTC_LRUNODE_QUEUE( node ) \
+ ( (FTC_Image_Queue)(node)->root.data )
+
static
- FT_Error ftc_image_cache_init_queue( FT_Lru lru,
- FT_LruNode node )
+ FT_Error ftc_image_cache_init_queue( FT_Lru lru,
+ FT_LruNode node )
{
- FTC_Image_Cache cache = FTC_QUEUE_LRU_GET_CACHE(lru);
- FTC_Image_Desc* desc = (FTC_Image_Desc*)node->key;
+ FTC_Image_Cache cache = FTC_QUEUE_LRU_GET_CACHE( lru );
+ FTC_Image_Desc* desc = (FTC_Image_Desc*)node->key;
FT_Error error;
FTC_Image_Queue queue;
+
error = FTC_Image_Queue_New( cache, desc, &queue );
- if (!error)
+ if ( !error )
{
/* good, now set the queue index within the queue object */
queue->index = node - lru->nodes;
@@ -509,34 +522,36 @@
static
- void ftc_image_cache_done_queue( FT_Lru lru,
- FT_LruNode node )
+ void ftc_image_cache_done_queue( FT_Lru lru,
+ FT_LruNode node )
{
- FTC_Image_Queue queue = FTC_LRUNODE_QUEUE(node);
+ FTC_Image_Queue queue = FTC_LRUNODE_QUEUE( node );
- FT_UNUSED(lru);
- FTC_Image_Queue_Done(queue);
+ FT_UNUSED( lru );
+
+
+ FTC_Image_Queue_Done( queue );
}
static
- FT_Bool ftc_image_cache_compare_queue( FT_LruNode node,
- FT_LruKey key )
+ FT_Bool ftc_image_cache_compare_queue( FT_LruNode node,
+ FT_LruKey key )
{
- FTC_Image_Queue queue = FTC_LRUNODE_QUEUE(node);
+ FTC_Image_Queue queue = FTC_LRUNODE_QUEUE( node );
FTC_Image_Desc* desc2 = (FTC_Image_Desc*)key;
FTC_Image_Desc* desc1 = &queue->descriptor;
- return ( desc1->size.face_id == desc2->size.face_id &&
- desc1->size.pix_width == desc2->size.pix_width &&
- desc1->size.pix_height == desc2->size.pix_height &&
- desc1->image_type == desc2->image_type );
- }
+ return ( desc1->size.face_id == desc2->size.face_id &&
+ desc1->size.pix_width == desc2->size.pix_width &&
+ desc1->size.pix_height == desc2->size.pix_height &&
+ desc1->image_type == desc2->image_type );
+ }
static
- const FT_Lru_Class ftc_image_queue_lru_class =
+ const FT_Lru_Class ftc_image_queue_lru_class =
{
sizeof( FT_LruRec ),
ftc_image_cache_init_queue,
@@ -546,17 +561,14 @@
};
-
-
-
- /* compress image cache if it needs it.. i.e. discards all old glyph images */
- /* until "cache.num_bytes" is under "cache.max_bytes". Note that this function */
- /* will avoid to remove "new_node".. */
+ /* compress image cache if necessary, i.e., discard all old glyph images */
+ /* until `cache.num_bytes' is less than `cache.max_bytes'. Note that */
+ /* this function will avoid to remove `new_node'. */
static
- void FTC_Image_Cache_Compress( FTC_Image_Cache cache,
- FTC_ImageNode new_node )
+ void FTC_Image_Cache_Compress( FTC_Image_Cache cache,
+ FTC_ImageNode new_node )
{
- while (cache->num_bytes > cache->max_bytes)
+ while ( cache->num_bytes > cache->max_bytes )
{
FT_ListNode cur = cache->glyphs_lru.tail;
FTC_Image_Queue queue;
@@ -566,17 +578,19 @@
FT_ULong size;
FTC_ImageNode inode;
- /* exit our loop if there isn't any glyph image left, or if */
- /* we reached the newly created node (which is always at the */
- /* start of the list..) */
+
+ /* exit our loop if there isn't any glyph image left, or if */
+ /* we reached the newly created node (which happens always at the */
+ /* start of the list) */
- inode = FTC_LISTNODE_TO_IMAGENODE(cur);
+ inode = FTC_LISTNODE_TO_IMAGENODE( cur );
if ( !cur || inode == new_node )
break;
- glyph_index = FTC_IMAGENODE_GET_GINDEX(inode);
- queue_index = FTC_IMAGENODE_GET_QINDEX(inode);
- queue = (FTC_Image_Queue)cache->queues_lru->nodes[queue_index].root.data;
+ glyph_index = FTC_IMAGENODE_GET_GINDEX( inode );
+ queue_index = FTC_IMAGENODE_GET_QINDEX( inode );
+ queue = (FTC_Image_Queue)cache->queues_lru->
+ nodes[queue_index].root.data;
hash_index = glyph_index % queue->hash_size;
size = queue->clazz->size_image( queue, inode );
@@ -599,10 +613,13 @@
FTC_Image_Cache cache;
+ if ( !acache || !manager || !manager->library )
+ return FT_Err_Invalid_Argument;
+
*acache = 0;
memory = manager->library->memory;
- if ( ALLOC( cache, sizeof(*cache) ) )
+ if ( ALLOC( cache, sizeof ( *cache ) ) )
goto Exit;
cache->manager = manager;
@@ -615,7 +632,7 @@
memory,
1, /* pre_alloc == TRUE */
&cache->queues_lru );
- if (error)
+ if ( error )
goto Exit;
*acache = cache;
@@ -628,11 +645,15 @@
}
-
FT_EXPORT_DEF( void ) FTC_Image_Cache_Done( FTC_Image_Cache cache )
{
- FT_Memory memory = cache->memory;
+ FT_Memory memory;
+
+ if ( !cache )
+ return;
+
+ memory = cache->memory;
/* discard image queues */
FT_Lru_Done( cache->queues_lru );
@@ -642,7 +663,6 @@
}
-
FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_Lookup(
FTC_Image_Cache cache,
FTC_Image_Desc* desc,
@@ -653,28 +673,34 @@
FTC_Image_Queue queue;
FTC_ImageNode inode;
+
+ /* check for valid `desc' delayed to FT_Lru_Lookup() */
+
+ if ( !cache || !aglyph )
+ return FT_Err_Invalid_Argument;
+
*aglyph = 0;
queue = cache->last_queue;
- if ( !queue ||
- queue->descriptor.size.face_id != desc->size.face_id ||
- queue->descriptor.size.pix_width != desc->size.pix_width ||
- queue->descriptor.size.pix_height != desc->size.pix_height ||
- queue->descriptor.image_type != desc->image_type )
+ if ( !queue ||
+ queue->descriptor.size.face_id != desc->size.face_id ||
+ queue->descriptor.size.pix_width != desc->size.pix_width ||
+ queue->descriptor.size.pix_height != desc->size.pix_height ||
+ queue->descriptor.image_type != desc->image_type )
{
- error = FT_Lru_Lookup( cache->queues_lru,
- (FT_LruKey)desc,
- (FT_Pointer*)&queue );
+ error = FT_Lru_Lookup( cache->queues_lru,
+ (FT_LruKey)desc,
+ (FT_Pointer*)&queue );
cache->last_queue = queue;
- if (error)
+ if ( error )
goto Exit;
}
error = FTC_Image_Queue_Lookup_Node( queue, gindex, &inode );
- if (error)
+ if ( error )
goto Exit;
FTC_Image_Cache_Compress( cache, inode );
- *aglyph = FTC_IMAGENODE_GET_GLYPH(inode);
+ *aglyph = FTC_IMAGENODE_GET_GLYPH( inode );
Exit:
return error;
diff --git a/src/cache/ftcimage.h b/src/cache/ftcimage.h
index 5ebc79f..28eaf41 100644
--- a/src/cache/ftcimage.h
+++ b/src/cache/ftcimage.h
@@ -2,7 +2,7 @@
/* */
/* ftcimage.h */
/* */
-/* FreeType Image Cache */
+/* FreeType Image Cache (specification). */
/* */
/* Copyright 2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
@@ -42,7 +42,7 @@
typedef struct FTC_ImageNodeRec_
{
- /* root1.data contains a FT_Glyph handle */
+ /* root1.data contains an FT_Glyph handle */
FT_ListNodeRec root1;
/* root2.data contains a glyph index + queue index */
@@ -54,8 +54,12 @@
/* macros to read/set the glyph & queue index in a FTC_ImageNode */
#define FTC_IMAGENODE_GET_GINDEX( n ) FTC_PTR_TO_GINDEX( (n)->root2.data )
#define FTC_IMAGENODE_GET_QINDEX( n ) FTC_PTR_TO_QINDEX( (n)->root2.data )
-#define FTC_IMAGENODE_GET_GLYPH(n) ((FT_Glyph)(n)->root1.data)
-#define FTC_IMAGENODE_SET_GLYPH(n,g) do { (n)->root1.data = g; } while (0)
+#define FTC_IMAGENODE_GET_GLYPH( n ) ( (FT_Glyph)(n)->root1.data )
+#define FTC_IMAGENODE_SET_GLYPH( n, g ) \
+ do \
+ { \
+ (n)->root1.data = g; \
+ } while ( 0 )
#define FTC_IMAGENODE_SET_INDICES( n, g, q ) \
do \
{ \
@@ -64,26 +68,27 @@
/* this macro is used to extract a handle to the global LRU list node */
- /* corresponding to a given image node.. */
-#define FTC_IMAGENODE_TO_LISTNODE(n) \
- ((FT_ListNode)&(n)->root2)
+ /* corresponding to a given image node */
+#define FTC_IMAGENODE_TO_LISTNODE( n ) \
+ ( (FT_ListNode)&(n)->root2 )
/* this macro is used to extract a handle to a given image node from */
/* the corresponding LRU glyph list node. That's a bit hackish.. */
-#define FTC_LISTNODE_TO_IMAGENODE(p) \
- ((FTC_ImageNode)((char*)(p) - offsetof(FTC_ImageNodeRec,root2)))
+#define FTC_LISTNODE_TO_IMAGENODE( p ) \
+ ( (FTC_ImageNode)( (char*)(p) - \
+ offsetof( FTC_ImageNodeRec,root2 ) ) )
typedef struct FTC_Image_CacheRec_
{
- FTC_Manager manager;
- FT_Memory memory;
+ FTC_Manager manager;
+ FT_Memory memory;
- FT_ULong max_bytes; /* maximum size of cache in bytes */
- FT_ULong num_bytes; /* current size of cache in bytes */
+ FT_ULong max_bytes; /* maximum size of cache in bytes */
+ FT_ULong num_bytes; /* current size of cache in bytes */
- FT_Lru queues_lru; /* static queues lru list */
- FT_ListRec glyphs_lru; /* global lru list of glyph images */
+ FT_Lru queues_lru; /* static queues lru list */
+ FT_ListRec glyphs_lru; /* global lru list of glyph images */
FTC_Image_Queue last_queue; /* small cache */
diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c
index 03ee3b8..828b637 100644
--- a/src/cache/ftcmanag.c
+++ b/src/cache/ftcmanag.c
@@ -1,8 +1,8 @@
/***************************************************************************/
/* */
-/* ftcmanag.h */
+/* ftcmanag.c */
/* */
-/* FreeType Cache Manager */
+/* FreeType Cache Manager (body). */
/* */
/* Copyright 2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
@@ -203,23 +203,28 @@
FT_EXPORT_FUNC( FT_Error ) FTC_Manager_New( FT_Library library,
FT_UInt max_faces,
- FT_UInt max_sizes,
+ FT_UInt max_sizes,
FTC_Face_Requester requester,
FT_Pointer req_data,
FTC_Manager* amanager )
{
FT_Error error;
- FT_Memory memory = library->memory;
+ FT_Memory memory;
FTC_Manager manager = 0;
+ if ( !library )
+ return FT_Err_Invalid_Library_Handle;
+
+ memory = library->memory;
+
if ( ALLOC( manager, sizeof ( *manager ) ) )
goto Exit;
- if (max_faces == 0)
+ if ( max_faces == 0 )
max_faces = FTC_MAX_FACES;
- if (max_sizes == 0)
+ if ( max_sizes == 0 )
max_sizes = FTC_MAX_SIZES;
error = FT_Lru_New( &ftc_face_lru_class,
@@ -259,9 +264,14 @@
FT_EXPORT_DEF( void ) FTC_Manager_Done( FTC_Manager manager )
{
- FT_Memory memory = manager->library->memory;
+ FT_Memory memory;
+ if ( !manager || !manager->library )
+ return;
+
+ memory = manager->library->memory;
+
FT_Lru_Done( manager->sizes_lru );
FT_Lru_Done( manager->faces_lru );
FREE( manager );
@@ -270,6 +280,9 @@
FT_EXPORT_DEF( void ) FTC_Manager_Reset( FTC_Manager manager )
{
+ if ( !manager )
+ return;
+
FT_Lru_Reset( manager->sizes_lru );
FT_Lru_Reset( manager->faces_lru );
}
@@ -279,13 +292,15 @@
FTC_FaceID face_id,
FT_Face* aface )
{
+ if ( !manager )
+ return FT_Err_Invalid_Argument;
+
return FT_Lru_Lookup( manager->faces_lru,
(FT_LruKey)face_id,
(FT_Pointer*)aface );
}
-
FT_EXPORT_DEF( FT_Error ) FTC_Manager_Lookup_Size( FTC_Manager manager,
FTC_SizeID size_id,
FT_Face* aface,
@@ -296,17 +311,20 @@
FT_Face face;
- if (aface)
+ /* check for valid `manager' delayed to FTC_Manager_Lookup_Face() */
+
+ if ( aface )
*aface = 0;
- if (asize)
+ if ( asize )
*asize = 0;
- error = FTC_Manager_Lookup_Face( manager, size_id->face_id, &face );
+ error = FTC_Manager_Lookup_Face( manager, size_id->face_id, &face );
if ( !error )
{
FT_Size size;
+
req.face = face;
req.width = size_id->pix_width;
req.height = size_id->pix_height;
@@ -319,10 +337,10 @@
/* select the size as the current one for this face */
face->size = size;
- if (asize)
+ if ( asize )
*asize = size;
- if (aface)
+ if ( aface )
*aface = face;
}
}
diff --git a/src/cache/ftcmanag.h b/src/cache/ftcmanag.h
index c2f68af..61f67f1 100644
--- a/src/cache/ftcmanag.h
+++ b/src/cache/ftcmanag.h
@@ -2,7 +2,7 @@
/* */
/* ftcmanag.h */
/* */
-/* FreeType Cache Manager */
+/* FreeType Cache Manager (specification). */
/* */
/* Copyright 2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
diff --git a/src/cache/ftlru.c b/src/cache/ftlru.c
index 3302bc1..288dd41 100644
--- a/src/cache/ftlru.c
+++ b/src/cache/ftlru.c
@@ -2,7 +2,7 @@
/* */
/* ftlru.c */
/* */
-/* simple LRU list-cache */
+/* Simple LRU list-cache (body). */
/* */
/* Copyright 2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
@@ -47,6 +47,9 @@
FT_Lru lru;
+ if ( !alru )
+ return FT_Err_Invalid_Argument;
+
*alru = 0;
if ( !ALLOC( lru, sizeof ( *lru ) ) )
{
@@ -80,11 +83,18 @@
FT_EXPORT_DEF( void ) FT_Lru_Reset( FT_Lru lru )
{
- FT_ListNode node = lru->elements.head;
- FT_Lru_Class* clazz = lru->clazz;
- FT_Memory memory = lru->memory;
+ FT_ListNode node;
+ FT_Lru_Class* clazz;
+ FT_Memory memory;
+ if ( !lru )
+ return;
+
+ node = lru->elements.head;
+ clazz = lru->clazz;
+ memory = lru->memory;
+
while ( node )
{
FT_ListNode next = node->next;
@@ -108,9 +118,14 @@
FT_EXPORT_DEF( void ) FT_Lru_Done( FT_Lru lru )
{
- FT_Memory memory = lru->memory;
+ FT_Memory memory;
+ if ( !lru )
+ return;
+
+ memory = lru->memory;
+
FT_Lru_Reset( lru );
FREE( lru );
}
@@ -120,13 +135,20 @@
FT_LruKey key,
FT_LruNode* anode )
{
- FT_Error error = 0;
- FT_ListNode node = lru->elements.head;
- FT_Lru_Class* clazz = lru->clazz;
- FT_LruNode found = 0;
- FT_Memory memory = lru->memory;
+ FT_Error error = 0;
+ FT_ListNode node;
+ FT_Lru_Class* clazz;
+ FT_LruNode found = 0;
+ FT_Memory memory;
+ if ( !lru || !key || !anode )
+ return FT_Err_Invalid_Argument;
+
+ node = lru->elements.head;
+ clazz = lru->clazz;
+ memory = lru->memory;
+
if ( clazz->compare_element )
{
for ( ; node; node = node->next )
@@ -243,6 +265,11 @@
FT_LruNode node;
+ /* check for valid `lru' and `key' delayed to FT_Lru_Lookup_Node() */
+
+ if ( !aobject )
+ return FT_Err_Invalid_Argument;
+
*aobject = 0;
error = FT_Lru_Lookup_Node( lru, key, &node );
if ( !error )
@@ -255,6 +282,9 @@
FT_EXPORT_FUNC( void ) FT_Lru_Remove_Node( FT_Lru lru,
FT_LruNode node )
{
+ if ( !lru || !node )
+ return;
+
if ( lru->num_elements > 0 )
{
FT_List_Remove( &lru->elements, (FT_ListNode)node );
@@ -279,6 +309,9 @@
FT_Lru_Selector selector,
FT_Pointer data )
{
+ if ( !lru || !selector )
+ return;
+
if ( lru->num_elements > 0 )
{
FT_ListNode node = lru->elements.head;
diff --git a/src/cache/ftlru.h b/src/cache/ftlru.h
index 175136b..28e6409 100644
--- a/src/cache/ftlru.h
+++ b/src/cache/ftlru.h
@@ -2,7 +2,7 @@
/* */
/* ftlru.h */
/* */
-/* simple LRU list-cache */
+/* Simple LRU list-cache (specification). */
/* */
/* Copyright 2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
@@ -41,7 +41,6 @@
typedef struct FT_LruRec_* FT_Lru;
-
typedef struct FT_Lru_Class_
{
FT_UInt lru_size; /* object size in bytes */
@@ -62,7 +61,6 @@
} FT_Lru_Class;
-
typedef FT_Bool (*FT_Lru_Selector)( FT_Lru lru,
FT_LruNode node,
FT_Pointer data );
diff --git a/src/cache/rules.mk b/src/cache/rules.mk
index 62b7cdd..a6b6801 100644
--- a/src/cache/rules.mk
+++ b/src/cache/rules.mk
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 2000 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -26,7 +26,7 @@ Cache_COMPILE := $(FT_COMPILE)
# Cache driver sources (i.e., C files)
#
-Cache_DRV_SRC := $(Cache_DIR_)ftlru.c \
+Cache_DRV_SRC := $(Cache_DIR_)ftlru.c \
$(Cache_DIR_)ftcmanag.c \
$(Cache_DIR_)ftcimage.c
diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c
index e9aed5c..6352731 100644
--- a/src/cid/cidgload.c
+++ b/src/cid/cidgload.c
@@ -33,6 +33,7 @@
#include <freetype/internal/ftstream.h>
#include <freetype/ftoutln.h>
+
/*************************************************************************/
/* */
/* The macro FT_COMPONENT is used in trace mode. It is an implicit */
@@ -43,7 +44,6 @@
#define FT_COMPONENT trace_cidgload
-
static
FT_Error cid_load_glyph( T1_Decoder* decoder,
FT_UInt glyph_index )
@@ -60,8 +60,8 @@
/* read the CID font dict index and charstring offset from the CIDMap */
if ( FILE_Seek( cid->data_offset + cid->cidmap_offset +
- glyph_index * entry_len) ||
- ACCESS_Frame( 2 * entry_len ) )
+ glyph_index * entry_len ) ||
+ ACCESS_Frame( 2 * entry_len ) )
goto Exit;
p = (FT_Byte*)stream->cursor;
@@ -117,9 +117,6 @@
}
-
-
-
#if 0
@@ -151,6 +148,7 @@
PSAux_Interface* psaux = (PSAux_Interface*)face->psaux;
+
*max_advance = 0;
/* Initialize load decoder */
@@ -158,10 +156,10 @@
(FT_Face)face,
0, /* size */
0, /* glyph slot */
- 0, /* glyph names !!!! XXXXX */
+ 0, /* glyph names! XXX */
0, /* blend == 0 */
cid_load_glyph );
- if (error)
+ if ( error )
return error;
decoder.builder.metrics_only = 1;
@@ -202,7 +200,6 @@
/*************************************************************************/
-
LOCAL_FUNC
FT_Error CID_Load_Glyph( CID_GlyphSlot glyph,
CID_Size size,
@@ -218,6 +215,7 @@
FT_Matrix font_matrix;
FT_Vector font_offset;
+
if ( load_flags & FT_LOAD_NO_RECURSE )
load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING;
@@ -237,12 +235,13 @@
(FT_Face)face,
(FT_Size)size,
(FT_GlyphSlot)glyph,
- 0, /* glyph names -- XXXX */
+ 0, /* glyph names -- XXX */
0, /* blend == 0 */
cid_load_glyph );
/* set up the decoder */
- decoder.builder.no_recurse = (load_flags & FT_LOAD_NO_RECURSE) != 0;
+ decoder.builder.no_recurse =
+ ( ( load_flags & FT_LOAD_NO_RECURSE ) != 0 );
error = cid_load_glyph( &decoder, glyph_index );
@@ -270,8 +269,8 @@
}
else
{
- FT_BBox cbox;
- FT_Glyph_Metrics* metrics = &glyph->root.metrics;
+ FT_BBox cbox;
+ FT_Glyph_Metrics* metrics = &glyph->root.metrics;
/* copy the _unscaled_ advance width */
@@ -329,8 +328,8 @@
{
cbox.xMin &= -64;
cbox.yMin &= -64;
- cbox.xMax = ( cbox.xMax+63 ) & -64;
- cbox.yMax = ( cbox.yMax+63 ) & -64;
+ cbox.xMax = ( cbox.xMax + 63 ) & -64;
+ cbox.yMax = ( cbox.yMax + 63 ) & -64;
}
metrics->width = cbox.xMax - cbox.xMin;
diff --git a/src/cid/cidgload.h b/src/cid/cidgload.h
index a735486..fa33795 100644
--- a/src/cid/cidgload.h
+++ b/src/cid/cidgload.h
@@ -36,8 +36,6 @@
#endif
-
-
#if 0
/* Compute the maximum advance width of a font through quick parsing */
@@ -45,7 +43,7 @@
FT_Error CID_Compute_Max_Advance( CID_Face face,
FT_Int* max_advance );
-#endif
+#endif /* 0 */
LOCAL_DEF
FT_Error CID_Load_Glyph( CID_GlyphSlot glyph,
diff --git a/src/cid/cidload.c b/src/cid/cidload.c
index cd43f65..bc4c539 100644
--- a/src/cid/cidload.c
+++ b/src/cid/cidload.c
@@ -372,7 +372,9 @@
/* we found it - run the parsing callback */
parser->root.cursor = cur2;
CID_Skip_Spaces( parser );
- parser->root.error = cid_load_keyword( face, loader, keyword );
+ parser->root.error = cid_load_keyword( face,
+ loader,
+ keyword );
if ( parser->root.error )
return parser->root.error;
diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c
index fb5dcc7..815e1ed 100644
--- a/src/cid/cidparse.c
+++ b/src/cid/cidparse.c
@@ -47,7 +47,6 @@
#define FT_COMPONENT trace_cidparse
-
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@@ -70,6 +69,7 @@
FT_Byte buffer[256 + 10];
FT_Int buff_len;
+
MEM_Set( parser, 0, sizeof ( *parser ) );
psaux->t1_parser_funcs->init( &parser->root, 0, 0, memory );
@@ -98,6 +98,7 @@
{
FT_Byte *p, *limit = buffer + 256;
+
/* fill input buffer */
buff_len -= 256;
if ( buff_len > 0 )
diff --git a/src/cid/cidparse.h b/src/cid/cidparse.h
index ea23bfe..22fa129 100644
--- a/src/cid/cidparse.h
+++ b/src/cid/cidparse.h
@@ -28,7 +28,6 @@
#endif
-
/*************************************************************************/
/* */
/* <Struct> */
@@ -87,20 +86,25 @@
/* */
/*************************************************************************/
-#define CID_Skip_Spaces(p) (p)->root.funcs.skip_spaces( &(p)->root )
-#define CID_Skip_Alpha(p) (p)->root.funcs.skip_alpha ( &(p)->root )
-
-#define CID_ToInt(p) (p)->root.funcs.to_int( &(p)->root )
-#define CID_ToFixed(p,t) (p)->root.funcs.to_fixed( &(p)->root, t )
-
-#define CID_ToCoordArray(p,m,c) (p)->root.funcs.to_coord_array( &(p)->root, m, c )
-#define CID_ToFixedArray(p,m,f,t) (p)->root.funcs.to_fixed_array( &(p)->root, m, f, t )
-#define CID_ToToken(p,t) (p)->root.funcs.to_token( &(p)->root, t )
-#define CID_ToTokenArray(p,t,m,c) (p)->root.funcs.to_token_array( &(p)->root, t, m, c )
-
-#define CID_Load_Field(p,f,o) (p)->root.funcs.load_field( &(p)->root, f, o, 0, 0 )
-#define CID_Load_Field_Table(p,f,o) (p)->root.funcs.load_field_table( &(p)->root, f, o, 0, 0 )
-
+#define CID_Skip_Spaces( p ) (p)->root.funcs.skip_spaces( &(p)->root )
+#define CID_Skip_Alpha( p ) (p)->root.funcs.skip_alpha ( &(p)->root )
+
+#define CID_ToInt( p ) (p)->root.funcs.to_int( &(p)->root )
+#define CID_ToFixed( p, t ) (p)->root.funcs.to_fixed( &(p)->root, t )
+
+#define CID_ToCoordArray( p, m, c ) \
+ (p)->root.funcs.to_coord_array( &(p)->root, m, c )
+#define CID_ToFixedArray( p, m, f, t ) \
+ (p)->root.funcs.to_fixed_array( &(p)->root, m, f, t )
+#define CID_ToToken( p, t ) \
+ (p)->root.funcs.to_token( &(p)->root, t )
+#define CID_ToTokenArray( p, t, m, c ) \
+ (p)->root.funcs.to_token_array( &(p)->root, t, m, c )
+
+#define CID_Load_Field( p, f, o ) \
+ (p)->root.funcs.load_field( &(p)->root, f, o, 0, 0 )
+#define CID_Load_Field_Table( p, f, o ) \
+ (p)->root.funcs.load_field_table( &(p)->root, f, o, 0, 0 )
#ifdef __cplusplus
diff --git a/src/cid/cidtokens.h b/src/cid/cidtokens.h
index 39cd500..81f9f36 100644
--- a/src/cid/cidtokens.h
+++ b/src/cid/cidtokens.h
@@ -21,17 +21,17 @@
#undef T1CODE
#define T1CODE t1_field_cid_info
- T1_FIELD_STRING ( "CIDFontName", cid_font_name )
- T1_FIELD_NUM ( "CIDFontVersion", cid_version )
- T1_FIELD_NUM ( "CIDFontType", cid_font_type )
- T1_FIELD_STRING ( "Registry", registry )
- T1_FIELD_STRING ( "Ordering", ordering )
- T1_FIELD_NUM ( "Supplement", supplement )
- T1_FIELD_NUM ( "UIDBase", uid_base )
- T1_FIELD_NUM ( "CIDMapOffset", cidmap_offset )
- T1_FIELD_NUM ( "FDBytes", fd_bytes )
- T1_FIELD_NUM ( "GDBytes", gd_bytes )
- T1_FIELD_NUM ( "CIDCount", cid_count )
+ T1_FIELD_STRING( "CIDFontName", cid_font_name )
+ T1_FIELD_NUM ( "CIDFontVersion", cid_version )
+ T1_FIELD_NUM ( "CIDFontType", cid_font_type )
+ T1_FIELD_STRING( "Registry", registry )
+ T1_FIELD_STRING( "Ordering", ordering )
+ T1_FIELD_NUM ( "Supplement", supplement )
+ T1_FIELD_NUM ( "UIDBase", uid_base )
+ T1_FIELD_NUM ( "CIDMapOffset", cidmap_offset )
+ T1_FIELD_NUM ( "FDBytes", fd_bytes )
+ T1_FIELD_NUM ( "GDBytes", gd_bytes )
+ T1_FIELD_NUM ( "CIDCount", cid_count )
#undef FT_STRUCTURE
@@ -55,15 +55,15 @@
#undef T1CODE
#define T1CODE t1_field_font_dict
- T1_FIELD_NUM ( "PaintType", paint_type )
- T1_FIELD_NUM ( "FontType", font_type )
- T1_FIELD_NUM ( "SubrMapOffset", subrmap_offset )
- T1_FIELD_NUM ( "SDBytes", sd_bytes )
- T1_FIELD_NUM ( "SubrCount", num_subrs )
- T1_FIELD_NUM ( "lenBuildCharArray", len_buildchar )
- T1_FIELD_FIXED ( "ForceBoldThreshold", forcebold_threshold )
- T1_FIELD_FIXED ( "ExpansionFactor", expansion_factor )
- T1_FIELD_NUM ( "StrokeWidth", stroke_width )
+ T1_FIELD_NUM ( "PaintType", paint_type )
+ T1_FIELD_NUM ( "FontType", font_type )
+ T1_FIELD_NUM ( "SubrMapOffset", subrmap_offset )
+ T1_FIELD_NUM ( "SDBytes", sd_bytes )
+ T1_FIELD_NUM ( "SubrCount", num_subrs )
+ T1_FIELD_NUM ( "lenBuildCharArray", len_buildchar )
+ T1_FIELD_FIXED( "ForceBoldThreshold", forcebold_threshold )
+ T1_FIELD_FIXED( "ExpansionFactor", expansion_factor )
+ T1_FIELD_NUM ( "StrokeWidth", stroke_width )
#undef FT_STRUCTURE
@@ -93,5 +93,4 @@
T1_FIELD_NUM_TABLE ( "StemSnapV", snap_heights, 12 )
-
/* END */
diff --git a/src/psaux/psauxmod.c b/src/psaux/psauxmod.c
index 8f76381..b8660dc 100644
--- a/src/psaux/psauxmod.c
+++ b/src/psaux/psauxmod.c
@@ -1,9 +1,28 @@
+/***************************************************************************/
+/* */
+/* psauxmod.c */
+/* */
+/* FreeType auxiliary PostScript module implementation (body). */
+/* */
+/* Copyright 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 <psaux/psauxmod.h>
#include <psaux/psobjs.h>
#include <psaux/t1decode.h>
+
LOCAL_FUNC
- const PS_Table_Funcs ps_table_funcs =
+ const PS_Table_Funcs ps_table_funcs =
{
PS_Table_New,
PS_Table_Done,
@@ -13,7 +32,7 @@
LOCAL_FUNC
- const T1_Parser_Funcs t1_parser_funcs =
+ const T1_Parser_Funcs t1_parser_funcs =
{
T1_Init_Parser,
T1_Done_Parser,
@@ -54,7 +73,7 @@
LOCAL_FUNC
- const PSAux_Interface psaux_interface =
+ const PSAux_Interface psaux_interface =
{
&ps_table_funcs,
&t1_parser_funcs,
@@ -65,7 +84,7 @@
};
- FT_CPLUSPLUS(const FT_Module_Class) psaux_module_class =
+ FT_CPLUSPLUS( const FT_Module_Class ) psaux_module_class =
{
0,
sizeof( FT_ModuleRec ),
@@ -75,8 +94,10 @@
&psaux_interface, /* module-specific interface */
- (FT_Module_Constructor) 0,
- (FT_Module_Destructor) 0,
- (FT_Module_Requester) 0
+ (FT_Module_Constructor)0,
+ (FT_Module_Destructor) 0,
+ (FT_Module_Requester) 0
};
+
+/* END */
diff --git a/src/psaux/psauxmod.h b/src/psaux/psauxmod.h
index a5b33c1..3c348cf 100644
--- a/src/psaux/psauxmod.h
+++ b/src/psaux/psauxmod.h
@@ -1,3 +1,21 @@
+/***************************************************************************/
+/* */
+/* psauxmod.h */
+/* */
+/* FreeType auxiliary PostScript module implementation (specification). */
+/* */
+/* Copyright 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. */
+/* */
+/***************************************************************************/
+
+
#ifndef PSAUXMOD_H
#define PSAUXMOD_H
@@ -14,3 +32,6 @@
#endif
#endif /* PSAUXMOD_H */
+
+
+/* END */
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index 6e73db5..8a78262 100644
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -878,7 +878,7 @@
if ( pflags )
*pflags |= 1L << field->flag_bit;
#else
- FT_UNUSED(pflags);
+ FT_UNUSED( pflags );
#endif
error = FT_Err_Ok;
@@ -943,7 +943,7 @@
if ( pflags )
*pflags |= 1L << field->flag_bit;
#else
- FT_UNUSED(pflags);
+ FT_UNUSED( pflags );
#endif
parser->cursor = old_cursor;
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index e364ba4..0a55b4d 100644
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -185,12 +185,12 @@
/* seac weirdness */
adx += decoder->builder.left_bearing.x;
- /* glyph_names is set to 0 for CID fonts which do not */
- /* include an encoding.. How can we deal with these ?? */
- if (decoder->glyph_names == 0)
+ /* `glyph_names' is set to 0 for CID fonts which do not */
+ /* include an encoding. How can we deal with these? */
+ if ( decoder->glyph_names == 0 )
{
FT_ERROR(( "t1operator_seac:" ));
- FT_ERROR(( " glyph names table not available in this font !!\n" ));
+ FT_ERROR(( " glyph names table not available in this font!\n" ));
return T1_Err_Syntax_Error;
}
diff --git a/src/type1z/z1gload.c b/src/type1z/z1gload.c
index 15ca3b9..0b68c2c 100644
--- a/src/type1z/z1gload.c
+++ b/src/type1z/z1gload.c
@@ -67,8 +67,9 @@
FT_Error Z1_Parse_Glyph( T1_Decoder* decoder,
FT_UInt glyph_index )
{
- T1_Face face = (T1_Face)decoder->builder.face;
- T1_Font* type1 = &face->type1;
+ T1_Face face = (T1_Face)decoder->builder.face;
+ T1_Font* type1 = &face->type1;
+
decoder->font_matrix = type1->font_matrix;
decoder->font_offset = type1->font_offset;
@@ -101,7 +102,7 @@
(FT_Byte**)type1->glyph_names,
face->blend,
Z1_Parse_Glyph );
- if (error)
+ if ( error )
return error;
decoder.builder.metrics_only = 1;
diff --git a/src/type1z/z1tokens.h b/src/type1z/z1tokens.h
index 04e25a5..b128bde 100644
--- a/src/type1z/z1tokens.h
+++ b/src/type1z/z1tokens.h
@@ -69,4 +69,5 @@
T1_FIELD_NUM( "FontType", font_type )
T1_FIELD_NUM( "StrokeWidth", stroke_width )
+
/* END */