Commit 0c8cde2e05561fd02b729f11c11a3589babfed54
2000-05-30T20:10:06
ftgrays.c: Formatting. It seems to me that _STANDALONE_ doesn't work yet... Will it ever work? If not, the unused code should be removed. ftconfig.h, ftobjs.h: Fix my last fix of the UNUSED() macro.
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 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473
diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h
index ab19663..cd598d8 100644
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@@ -98,7 +98,7 @@
/* UNUSED is a macro used to indicate that a given parameter is not used */
/* this is only used to get rid of unpleasant compiler warnings.. */
#ifndef UNUSED
-#define UNUSED( arg ) ( (void)(arg)=(arg) )
+#define UNUSED( arg ) ( (arg)=(arg) )
#endif
diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index 8351f82..d04b184 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -45,7 +45,7 @@
#endif
#ifndef UNUSED
-#define UNUSED( arg ) ( (void)(arg)=(arg) )
+#define UNUSED( arg ) ( (arg)=(arg) )
#endif
diff --git a/src/base/ftgrays.c b/src/base/ftgrays.c
index 14535b7..a300391 100644
--- a/src/base/ftgrays.c
+++ b/src/base/ftgrays.c
@@ -1,959 +1,1067 @@
-/*****************************************************************************/
-/* */
-/* ftgrays.c - a new 'perfect' anti-aliasing renderer for FreeType 2 */
-/* */
-/* Copyright 2000 by The FreeType Project */
-/* 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. */
-/* */
-/* This is a new anti-aliasing scan-converter for FreeType 2. The */
-/* algorithm used here is _very_ different from the one in the standard */
-/* "ftraster.c". Actually, "ftgrays.c" computes the _exact_ coverage of */
-/* the outline on each pixel cell. */
-/* */
-/* It is based on ideas that I initially found in Raph Levien's excellent */
-/* LibArt graphics library (see www.levien.com/libart for more information, */
-/* though the web pages do not tell anything about the renderer, you'll */
-/* have to dive in the source code to understand how it works..) */
-/* */
-/* Note however that this is a _very_ different implementation from */
-/* Raph's. Coverage information is stored in a very different way, */
-/* and I don't use sorted vector paths. Also, it doesn't use floating */
-/* point values.. */
-/* */
-/* This renderer has the following advantages: */
-/* */
-/* - doesn't need an intermediate bitmap. Instead, one can supply */
-/* a callback fuction that will be called by the renderer to */
-/* draw gray spans on any target surface.. You can thus do direct */
-/* composition on any kind of bitmap, provided that you give the */
-/* renderer the right callback.. */
-/* */
-/* - perfect anti-aliaser, i.e. computes the _exact_ coverage on */
-/* each pixel cell */
-/* */
-/* - performs a single pass on the outline (the 'standard' FT2 */
-/* renderer performs two passes). */
-/* */
-/* - can easily be modified to render to _any_ number of gray levels */
-/* cheaply.. */
-/* */
-/* - faster than the standard renderer for small (< 20) pixel sizes */
-/* */
+/***************************************************************************/
+/* */
+/* ftgrays.c */
+/* */
+/* A new `perfect' anti-aliasing renderer (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. */
+/* */
+/***************************************************************************/
+
+ /*************************************************************************/
+ /* */
+ /* This is a new anti-aliasing scan-converter for FreeType 2. The */
+ /* algorithm used here is _very_ different from the one in the standard */
+ /* `ftraster' module. Actually, `ftgrays' computes the _exact_ */
+ /* coverage of the outline on each pixel cell. */
+ /* */
+ /* It is based on ideas that I initially found in Raph Levien's */
+ /* excellent LibArt graphics library (see http://www.levien.com/libart */
+ /* for more information, though the web pages do not tell anything */
+ /* about the renderer; you'll have to dive into the source code to */
+ /* understand how it works). */
+ /* */
+ /* Note, however, that this is a _very_ different implementation */
+ /* compared Raph's. Coverage information is stored in a very different */
+ /* way, and I don't use sorted vector paths. Also, it doesn't use */
+ /* floating point values. */
+ /* */
+ /* This renderer has the following advantages: */
+ /* */
+ /* - It doesn't need an intermediate bitmap. Instead, one can supply */
+ /* a callback function that will be called by the renderer to draw */
+ /* gray spans on any target surface. You can thus do direct */
+ /* composition on any kind of bitmap, provided that you give the */
+ /* renderer the right callback. */
+ /* */
+ /* - A perfect anti-aliaser, i.e., it computes the _exact_ coverage on */
+ /* each pixel cell */
+ /* */
+ /* - It performs a single pass on the outline (the `standard' FT2 */
+ /* renderer makes two passes). */
+ /* */
+ /* - It can easily be modified to render to _any_ number of gray levels */
+ /* cheaply. */
+ /* */
+ /* - For small (< 20) pixel sizes, it is faster than the standard */
+ /* renderer. */
+ /* */
+ /*************************************************************************/
+
#include <freetype/ftgrays.h>
-#include <string.h> /* for memcpy */
+#include <string.h> /* for memcpy() */
#define ErrRaster_Invalid_Outline -1
#ifdef _STANDALONE_
-#error "implementation of FT_Outline_Decompose missing !!!"
+#error "implementation of FT_Outline_Decompose missing!"
#else
-#include <freetype/freetype.h> /* to link to FT_Outline_Decompose */
+#include <freetype/internal/ftobjs.h> /* for UNUSED() */
+#include <freetype/freetype.h> /* to link to FT_Outline_Decompose() */
#endif
-/* define this to dump debugging information */
+ /* define this to dump debugging information */
#define xxxDEBUG_GRAYS
-/* as usual, for the speed hungry :-) */
+ /* as usual, for the speed hungry :-) */
+
#ifndef FT_STATIC_RASTER
- #define RAS_ARG PRaster raster
- #define RAS_ARG_ PRaster raster,
+#define RAS_ARG PRaster raster
+#define RAS_ARG_ PRaster raster,
- #define RAS_VAR raster
- #define RAS_VAR_ raster,
+#define RAS_VAR raster
+#define RAS_VAR_ raster,
- #define ras (*raster)
+#define ras (*raster)
-#else
+#else /* FT_STATIC_RASTER */
- #define RAS_ARG
- #define RAS_ARG_
- #define RAS_VAR
- #define RAS_VAR_
+#define RAS_ARG /* empty */
+#define RAS_ARG_ /* empty */
+#define RAS_VAR /* empty */
+#define RAS_VAR_ /* empty */
static TRaster ras;
-#endif
+#endif /* FT_STATIC_RASTER */
-/* must be at least 6 bits !! */
-#define PIXEL_BITS 8
+ /* must be at least 6 bits! */
+#define PIXEL_BITS 8
-#define ONE_PIXEL (1L << PIXEL_BITS)
-#define PIXEL_MASK (-1L << PIXEL_BITS)
-#define TRUNC(x) ((x) >> PIXEL_BITS)
-#define SUBPIXELS(x) ((x) << PIXEL_BITS)
-#define FLOOR(x) ((x) & -ONE_PIXEL)
-#define CEILING(x) (((x)+ONE_PIXEL-1) & -ONE_PIXEL)
-#define ROUND(x) (((x)+ONE_PIXEL/2) & -ONE_PIXEL)
+#define ONE_PIXEL ( 1L << PIXEL_BITS )
+#define PIXEL_MASK ( -1L << PIXEL_BITS )
+#define TRUNC( x ) ( (x) >> PIXEL_BITS )
+#define SUBPIXELS( x ) ( (x) << PIXEL_BITS )
+#define FLOOR( x ) ( (x) & -ONE_PIXEL )
+#define CEILING( x ) ( ( (x) + ONE_PIXEL - 1 ) & -ONE_PIXEL )
+#define ROUND( x ) ( ( (x) + ONE_PIXEL / 2 ) & -ONE_PIXEL )
#if PIXEL_BITS >= 6
-#define UPSCALE(x) ((x) << (PIXEL_BITS-6))
-#define DOWNSCALE(x) ((x) >> (PIXEL_BITS-6))
+#define UPSCALE( x ) ( (x) << ( PIXEL_BITS - 6 ) )
+#define DOWNSCALE( x ) ( (x) >> ( PIXEL_BITS - 6 ) )
#else
-#define UPSCALE(x) ((x) >> (6-PIXEL_BITS))
-#define DOWNSCALE(x) ((x) << (6-PIXEL_BITS))
+#define UPSCALE( x ) ( (x) >> ( 6 - PIXEL_BITS ) )
+#define DOWNSCALE( x ) ( (x) << ( 6 - PIXEL_BITS ) )
#endif
-/* define if you want to use more compact storage, this increases the number */
-/* of cells available in the render pool but slows down the rendering a bit */
-/* useful when you have a really tiny render pool */
-#define xxxGRAYS_COMPACT
-
+ /* Define this if you want to use a more compact storage scheme. This */
+ /* increases the number of cells available in the render pool but slows */
+ /* down the rendering a bit. It is useful if you have a really tiny */
+ /* render pool. */
+#define xxxGRAYS_COMPACT
-/****************************************************************************/
-/* */
-/* TYPE DEFINITIONS */
-/* */
+ /*************************************************************************/
+ /* */
+ /* TYPE DEFINITIONS */
+ /* */
+ typedef int TScan; /* integer scanline/pixel coordinate */
+ typedef long TPos; /* sub-pixel coordinate */
-typedef int TScan; /* integer scanline/pixel coordinate */
-typedef long TPos; /* sub-pixel coordinate */
-
-/* maximum number of gray spans in a call to the span callback */
+ /* maximal number of gray spans in a call to the span callback */
#define FT_MAX_GRAY_SPANS 32
#ifdef GRAYS_COMPACT
-typedef struct TCell_
-{
- short x : 14;
- short y : 14;
- int cover : PIXEL_BITS+2;
- int area : PIXEL_BITS*2+2;
-
-} TCell, *PCell;
-#else
-typedef struct TCell_
-{
- TScan x;
- TScan y;
- int cover;
- int area;
-
-} TCell, *PCell;
-#endif
+ typedef struct TCell_
+ {
+ short x : 14;
+ short y : 14;
+ int cover : PIXEL_BITS + 2;
+ int area : PIXEL_BITS * 2 + 2;
-typedef struct TRaster_
-{
- PCell cells;
- int max_cells;
- int num_cells;
+ } TCell, *PCell;
- TScan min_ex, max_ex;
- TScan min_ey, max_ey;
+#else /* GRAYS_COMPACT */
- int area;
- int cover;
- int invalid;
+ typedef struct TCell_
+ {
+ TScan x;
+ TScan y;
+ int cover;
+ int area;
- TScan ex, ey;
- TScan cx, cy;
- TPos x, y;
+ } TCell, *PCell;
- TScan last_ey;
+#endif /* GRAYS_COMPACT */
- FT_Vector bez_stack[32*3];
- int lev_stack[32];
- FT_Outline outline;
- FT_Bitmap target;
+ typedef struct TRaster_
+ {
+ PCell cells;
+ int max_cells;
+ int num_cells;
+
+ TScan min_ex, max_ex;
+ TScan min_ey, max_ey;
- FT_Span gray_spans[ FT_MAX_GRAY_SPANS ];
- int num_gray_spans;
+ int area;
+ int cover;
+ int invalid;
- FT_Raster_Span_Func render_span;
- void* render_span_data;
- int span_y;
+ TScan ex, ey;
+ TScan cx, cy;
+ TPos x, y;
- int band_size;
- int band_shoot;
- int conic_level;
- int cubic_level;
+ TScan last_ey;
- void* memory;
+ FT_Vector bez_stack[32 * 3];
+ int lev_stack[32];
-} TRaster, *PRaster;
+ FT_Outline outline;
+ FT_Bitmap target;
+ FT_Span gray_spans[FT_MAX_GRAY_SPANS];
+ int num_gray_spans;
+ FT_Raster_Span_Func render_span;
+ void* render_span_data;
+ int span_y;
+ int band_size;
+ int band_shoot;
+ int conic_level;
+ int cubic_level;
-/****************************************************************************/
-/* */
-/* INITIALIZE THE CELLS TABLE */
-/* */
-static
-void init_cells( RAS_ARG_ void* buffer, long byte_size )
-{
- ras.cells = (PCell)buffer;
- ras.max_cells = byte_size / sizeof(TCell);
- ras.num_cells = 0;
- ras.area = 0;
- ras.cover = 0;
- ras.invalid = 1;
-}
+ void* memory;
+ } TRaster, *PRaster;
-/****************************************************************************/
-/* */
-/* COMPUTE THE OUTLINE BOUNDING BOX */
-/* */
-static
-void compute_cbox( RAS_ARG_ FT_Outline* outline )
-{
- FT_Vector* vec = outline->points;
- FT_Vector* limit = vec + outline->n_points;
- if ( outline->n_points <= 0 )
+ /*************************************************************************/
+ /* */
+ /* Initialize the cells table. */
+ /* */
+ static
+ void init_cells( RAS_ARG_ void* buffer,
+ long byte_size )
{
- ras.min_ex = ras.max_ex = 0;
- ras.min_ey = ras.max_ey = 0;
- return;
+ ras.cells = (PCell)buffer;
+ ras.max_cells = byte_size / sizeof ( TCell );
+ ras.num_cells = 0;
+ ras.area = 0;
+ ras.cover = 0;
+ ras.invalid = 1;
}
- ras.min_ex = ras.max_ex = vec->x;
- ras.min_ey = ras.max_ey = vec->y;
- vec++;
- for ( ; vec < limit; vec++ )
+ /*************************************************************************/
+ /* */
+ /* Compute the outline bounding box. */
+ /* */
+ static
+ void compute_cbox( RAS_ARG_ FT_Outline* outline )
{
- TPos x = vec->x;
- TPos y = vec->y;
+ FT_Vector* vec = outline->points;
+ FT_Vector* limit = vec + outline->n_points;
- if ( x < ras.min_ex ) ras.min_ex = x;
- if ( x > ras.max_ex ) ras.max_ex = x;
- if ( y < ras.min_ey ) ras.min_ey = y;
- if ( y > ras.max_ey ) ras.max_ey = y;
- }
- /* truncate the bounding box to integer pixels */
- ras.min_ex = ras.min_ex >> 6;
- ras.min_ey = ras.min_ey >> 6;
- ras.max_ex = ( ras.max_ex+63 ) >> 6;
- ras.max_ey = ( ras.max_ey+63 ) >> 6;
-}
+ if ( outline->n_points <= 0 )
+ {
+ ras.min_ex = ras.max_ex = 0;
+ ras.min_ey = ras.max_ey = 0;
+ return;
+ }
+
+ ras.min_ex = ras.max_ex = vec->x;
+ ras.min_ey = ras.max_ey = vec->y;
+ vec++;
-/****************************************************************************/
-/* */
-/* RECORD THE CURRENT CELL IN THE TABLE */
-/* */
-static
-int record_cell( RAS_ARG )
-{
- PCell cell;
+ for ( ; vec < limit; vec++ )
+ {
+ TPos x = vec->x;
+ TPos y = vec->y;
- if (!ras.invalid && (ras.area | ras.cover))
- {
- if ( ras.num_cells >= ras.max_cells )
- return 1;
- cell = ras.cells + ras.num_cells++;
- cell->x = (ras.ex - ras.min_ex);
- cell->y = (ras.ey - ras.min_ey);
- cell->area = ras.area;
- cell->cover = ras.cover;
- }
- return 0;
-}
-
-
-/****************************************************************************/
-/* */
-/* SET THE CURRENT CELL TO A NEW POSITION */
-/* */
-static
-int set_cell( RAS_ARG_ TScan ex, TScan ey )
-{
- int invalid, record, clean;
-
- /* move the cell pointer to a new position. We set the "invalid" */
- /* flag to indicate that the cell isn't part of those we're interested */
- /* in during the render phase.. This means that: */
- /* */
- /* the new vertical position must be within min_ey..max_ey-1. */
- /* the new horizontal position must be strictly less than max_ey */
- /* */
- /* Note that we a cell is to the left of the clipping region, it is */
- /* actually set to the (min_ex-1) horizontal position */
- /* */
- record = 0;
- clean = 1;
- invalid = ( ey < ras.min_ey || ey >= ras.max_ey || ex >= ras.max_ex );
- if (!invalid)
- {
- /* all cells that are on the left of the clipping region go to the */
- /* min_ex-1 horizontal position.. */
- if (ex < ras.min_ex)
- ex = ras.min_ex-1;
-
- /* if our position is new, then record the previous cell */
- if (ex != ras.ex || ey != ras.ey)
- record = 1;
- else
- clean = ras.invalid; /* do not clean if we didn't move from */
- /* a valid cell.. */
+ if ( x < ras.min_ex ) ras.min_ex = x;
+ if ( x > ras.max_ex ) ras.max_ex = x;
+ if ( y < ras.min_ey ) ras.min_ey = y;
+ if ( y > ras.max_ey ) ras.max_ey = y;
+ }
+
+ /* truncate the bounding box to integer pixels */
+ ras.min_ex = ras.min_ex >> 6;
+ ras.min_ey = ras.min_ey >> 6;
+ ras.max_ex = ( ras.max_ex + 63 ) >> 6;
+ ras.max_ey = ( ras.max_ey + 63 ) >> 6;
}
- /* record the previous cell if needed (i.e. if we changed the cell */
- /* position, of changed the 'invalid' flag..) */
- if ( (ras.invalid != invalid || record) && record_cell( RAS_VAR ) )
- return 1;
- if (clean)
+ /*************************************************************************/
+ /* */
+ /* Record the current cell in the table. */
+ /* */
+ static
+ int record_cell( RAS_ARG )
{
- ras.area = 0;
- ras.cover = 0;
+ PCell cell;
+
+
+ if ( !ras.invalid && ( ras.area | ras.cover ) )
+ {
+ if ( ras.num_cells >= ras.max_cells )
+ return 1;
+
+ cell = ras.cells + ras.num_cells++;
+ cell->x = ras.ex - ras.min_ex;
+ cell->y = ras.ey - ras.min_ey;
+ cell->area = ras.area;
+ cell->cover = ras.cover;
+ }
+
+ return 0;
}
- ras.invalid = invalid;
- ras.ex = ex;
- ras.ey = ey;
- return 0;
-}
-
-
-
-/****************************************************************************/
-/* */
-/* START A NEW CONTOUR AT A GIVEN CELL */
-/* */
-static
-void start_cell( RAS_ARG_ TScan ex, TScan ey )
-{
- if (ex < ras.min_ex)
- ex = ras.min_ex-1;
-
- ras.area = 0;
- ras.cover = 0;
- ras.ex = ex;
- ras.ey = ey;
- ras.last_ey = SUBPIXELS(ey);
- ras.invalid = 0;
-
- (void)set_cell( RAS_VAR_ ex, ey );
-}
-
-
-/****************************************************************************/
-/* */
-/* RENDER A SCANLINE AS ONE OR MORE CELLS */
-/* */
-static
-int render_scanline( RAS_ARG_ TScan ey, TPos x1, TScan y1,
- TPos x2, TScan y2 )
-{
- TScan ex1, ex2, fx1, fx2, delta;
- long p, first, dx;
- int incr, lift, mod, rem;
-
- dx = x2-x1;
-
- ex1 = TRUNC(x1); /* if (ex1 >= ras.max_ex) ex1 = ras.max_ex-1; */
- ex2 = TRUNC(x2); /* if (ex2 >= ras.max_ex) ex2 = ras.max_ex-1; */
- fx1 = x1 - SUBPIXELS(ex1);
- fx2 = x2 - SUBPIXELS(ex2);
-
- /* trivial case. Happens often */
- if (y1 == y2)
- return set_cell( RAS_VAR_ ex2, ey );
-
-
- /* everything is located in a single cell, that is easy ! */
- /* */
- if ( ex1 == ex2 )
+
+ /*************************************************************************/
+ /* */
+ /* Set the current cell to a new position. */
+ /* */
+ static
+ int set_cell( RAS_ARG_ TScan ex,
+ TScan ey )
{
- delta = y2-y1;
- ras.area += (fx1+fx2)*delta;
- ras.cover += delta;
+ int invalid, record, clean;
+
+
+ /* Move the cell pointer to a new position. We set the `invalid' */
+ /* flag to indicate that the cell isn't part of those we're interested */
+ /* in during the render phase. This means that: */
+ /* */
+ /* . the new vertical position must be within min_ey..max_ey - 1. */
+ /* . the new horizontal position must be strictly less than max_ey */
+ /* */
+ /* Note that if a cell is to the left of the clipping region, it is */
+ /* actually set to the (min_ex-1) horizontal position. */
+
+ record = 0;
+ clean = 1;
+
+ invalid = ( ey < ras.min_ey || ey >= ras.max_ey || ex >= ras.max_ex );
+ if ( !invalid )
+ {
+ /* All cells that are on the left of the clipping region go to the */
+ /* min_ex - 1 horizontal position. */
+ if ( ex < ras.min_ex )
+ ex = ras.min_ex - 1;
+
+ /* if our position is new, then record the previous cell */
+ if ( ex != ras.ex || ey != ras.ey )
+ record = 1;
+ else
+ clean = ras.invalid; /* do not clean if we didn't move from */
+ /* a valid cell */
+ }
+
+ /* record the previous cell if needed (i.e., if we changed the cell */
+ /* position, of changed the `invalid' flag) */
+ if ( ( ras.invalid != invalid || record ) && record_cell( RAS_VAR ) )
+ return 1;
+
+ if ( clean )
+ {
+ ras.area = 0;
+ ras.cover = 0;
+ }
+
+ ras.invalid = invalid;
+ ras.ex = ex;
+ ras.ey = ey;
return 0;
}
- /* ok, we'll have to render a run of adjacent cells on the same */
- /* scanline.. */
- /* */
- p = (ONE_PIXEL-fx1)*(y2-y1);
- first = ONE_PIXEL;
- incr = 1;
- if ( dx < 0 )
+
+ /*************************************************************************/
+ /* */
+ /* Start a new contour at a given cell. */
+ /* */
+ static
+ void start_cell( RAS_ARG_ TScan ex,
+ TScan ey )
{
- p = fx1*(y2-y1);
- first = 0;
- incr = -1;
- dx = -dx;
+ if ( ex < ras.min_ex )
+ ex = ras.min_ex - 1;
+
+ ras.area = 0;
+ ras.cover = 0;
+ ras.ex = ex;
+ ras.ey = ey;
+ ras.last_ey = SUBPIXELS( ey );
+ ras.invalid = 0;
+
+ (void)set_cell( RAS_VAR_ ex, ey );
}
- delta = p / dx;
- mod = p % dx;
- if (mod < 0)
+
+ /*************************************************************************/
+ /* */
+ /* Render a scanline as one or more cells. */
+ /* */
+ static
+ int render_scanline( RAS_ARG_ TScan ey,
+ TPos x1,
+ TScan y1,
+ TPos x2,
+ TScan y2 )
{
- delta--;
- mod += dx;
- }
+ TScan ex1, ex2, fx1, fx2, delta;
+ long p, first, dx;
+ int incr, lift, mod, rem;
- ras.area += (fx1+first)*delta;
- ras.cover += delta;
- ex1 += incr;
- if (set_cell( RAS_VAR_ ex1, ey )) goto Error;
- y1 += delta;
+ dx = x2 - x1;
- if (ex1 != ex2)
- {
- p = ONE_PIXEL*(y2-y1);
- lift = p / dx;
- rem = p % dx;
- if (rem < 0)
+ ex1 = TRUNC( x1 ); /* if (ex1 >= ras.max_ex) ex1 = ras.max_ex-1; */
+ ex2 = TRUNC( x2 ); /* if (ex2 >= ras.max_ex) ex2 = ras.max_ex-1; */
+ fx1 = x1 - SUBPIXELS( ex1 );
+ fx2 = x2 - SUBPIXELS( ex2 );
+
+ /* trivial case. Happens often */
+ if ( y1 == y2 )
+ return set_cell( RAS_VAR_ ex2, ey );
+
+ /* everything is located in a single cell. That is easy! */
+ /* */
+ if ( ex1 == ex2 )
{
- lift--;
- rem += dx;
+ delta = y2 - y1;
+ ras.area += ( fx1 + fx2 ) * delta;
+ ras.cover += delta;
+ return 0;
}
- mod -= dx;
+ /* ok, we'll have to render a run of adjacent cells on the same */
+ /* scanline... */
+ /* */
+ p = ( ONE_PIXEL - fx1 ) * ( y2 - y1 );
+ first = ONE_PIXEL;
+ incr = 1;
+
+ if ( dx < 0 )
+ {
+ p = fx1 * ( y2 - y1 );
+ first = 0;
+ incr = -1;
+ dx = -dx;
+ }
- while (ex1 != ex2)
+ delta = p / dx;
+ mod = p % dx;
+ if ( mod < 0 )
{
- delta = lift;
- mod += rem;
- if (mod >= 0)
+ delta--;
+ mod += dx;
+ }
+
+ ras.area += ( fx1 + first ) * delta;
+ ras.cover += delta;
+
+ ex1 += incr;
+ if ( set_cell( RAS_VAR_ ex1, ey ) )
+ goto Error;
+ y1 += delta;
+
+ if ( ex1 != ex2 )
+ {
+ p = ONE_PIXEL * ( y2 - y1 );
+ lift = p / dx;
+ rem = p % dx;
+ if ( rem < 0 )
{
- mod -= dx;
- delta++;
+ lift--;
+ rem += dx;
+ }
+
+ mod -= dx;
+
+ while ( ex1 != ex2 )
+ {
+ delta = lift;
+ mod += rem;
+ if ( mod >= 0 )
+ {
+ mod -= dx;
+ delta++;
+ }
+
+ ras.area += ONE_PIXEL * delta;
+ ras.cover += delta;
+ y1 += delta;
+ ex1 += incr;
+ if ( set_cell( RAS_VAR_ ex1, ey ) )
+ goto Error;
}
- ras.area += ONE_PIXEL*delta;
- ras.cover += delta;
- y1 += delta;
- ex1 += incr;
- if (set_cell( RAS_VAR_ ex1, ey )) goto Error;
}
+
+ delta = y2 - y1;
+ ras.area += ( fx2 + ONE_PIXEL - first ) * delta;
+ ras.cover += delta;
+
+ return 0;
+
+ Error:
+ return 1;
}
- delta = y2-y1;
- ras.area += (fx2+ONE_PIXEL-first)*delta;
- ras.cover += delta;
-
- return 0;
-Error:
- return 1;
-}
-
-/****************************************************************************/
-/* */
-/* RENDER A GIVEN LINE AS A SERIES OF SCANLINES */
-/* */
-static
-int render_line( RAS_ARG_ TPos to_x, TPos to_y )
-{
- TScan ey1, ey2, fy1, fy2;
- TPos dx, dy, x, x2;
- int p, rem, mod, lift, delta, first, incr;
-
- ey1 = TRUNC(ras.last_ey);
- ey2 = TRUNC(to_y); /* if (ey2 >= ras.max_ey) ey2 = ras.max_ey-1; */
- fy1 = ras.y - ras.last_ey;
- fy2 = to_y - SUBPIXELS(ey2);
-
- dx = to_x - ras.x;
- dy = to_y - ras.y;
-
- /* we should do something about the trivial case where dx == 0, */
- /* as it happens very often !! ... XXXXX */
-
- /* perform vertical clipping */
+
+ /*************************************************************************/
+ /* */
+ /* Render a given line as a series of scanlines. */
+ /* */
+ static
+ int render_line( RAS_ARG_ TPos to_x,
+ TPos to_y )
{
- TScan min, max;
- min = ey1;
- max = ey2;
- if (ey1 > ey2)
+ TScan ey1, ey2, fy1, fy2;
+ TPos dx, dy, x, x2;
+ int p, rem, mod, lift, delta, first, incr;
+
+
+ ey1 = TRUNC( ras.last_ey );
+ ey2 = TRUNC( to_y ); /* if (ey2 >= ras.max_ey) ey2 = ras.max_ey-1; */
+ fy1 = ras.y - ras.last_ey;
+ fy2 = to_y - SUBPIXELS( ey2 );
+
+ dx = to_x - ras.x;
+ dy = to_y - ras.y;
+
+ /* we should do something about the trivial case where dx == 0, */
+ /* as it happens very often! XXXXX */
+
+ /* perform vertical clipping */
{
- min = ey2;
- max = ey1;
- }
- if (min >= ras.max_ey || max < ras.min_ey)
- goto Fin;
- }
+ TScan min, max;
- /* everything is on a single scanline */
- if ( ey1 == ey2 )
- {
- if (render_scanline( RAS_VAR_ ey1, ras.x, fy1, to_x, fy2 )) goto Error;
- goto Fin;
- }
- /* ok, we'll have to render several scanlines */
- p = (ONE_PIXEL-fy1)*dx;
- first = ONE_PIXEL;
- incr = 1;
- if ( dy < 0 )
- {
- p = fy1*dx;
- first = 0;
- incr = -1;
- dy = -dy;
- }
+ min = ey1;
+ max = ey2;
+ if ( ey1 > ey2 )
+ {
+ min = ey2;
+ max = ey1;
+ }
+ if ( min >= ras.max_ey || max < ras.min_ey )
+ goto End;
+ }
- delta = p / dy;
- mod = p % dy;
- if (mod < 0)
- {
- delta--;
- mod += dy;
- }
+ /* everything is on a single scanline */
+ if ( ey1 == ey2 )
+ {
+ if ( render_scanline( RAS_VAR_ ey1, ras.x, fy1, to_x, fy2 ) )
+ goto Error;
+ goto End;
+ }
- x = ras.x + delta;
- if (render_scanline( RAS_VAR_ ey1, ras.x, fy1, x, first )) goto Error;
+ /* ok, we'll have to render several scanlines */
+ p = ( ONE_PIXEL - fy1 ) * dx;
+ first = ONE_PIXEL;
+ incr = 1;
- ey1 += incr;
- if (set_cell( RAS_VAR_ TRUNC(x), ey1 )) goto Error;
+ if ( dy < 0 )
+ {
+ p = fy1 * dx;
+ first = 0;
+ incr = -1;
+ dy = -dy;
+ }
- if (ey1 != ey2)
- {
- p = ONE_PIXEL*dx;
- lift = p / dy;
- rem = p % dy;
- if (rem < 0)
+ delta = p / dy;
+ mod = p % dy;
+ if ( mod < 0 )
{
- lift--;
- rem += dy;
+ delta--;
+ mod += dy;
}
- mod -= dy;
- while (ey1 != ey2)
+ x = ras.x + delta;
+ if ( render_scanline( RAS_VAR_ ey1, ras.x, fy1, x, first ) )
+ goto Error;
+
+ ey1 += incr;
+ if ( set_cell( RAS_VAR_ TRUNC( x ), ey1 ) )
+ goto Error;
+
+ if ( ey1 != ey2 )
{
- delta = lift;
- mod += rem;
- if (mod >= 0)
+ p = ONE_PIXEL * dx;
+ lift = p / dy;
+ rem = p % dy;
+ if ( rem < 0 )
{
- mod -= dy;
- delta++;
+ lift--;
+ rem += dy;
+ }
+ mod -= dy;
+
+ while ( ey1 != ey2 )
+ {
+ delta = lift;
+ mod += rem;
+ if ( mod >= 0 )
+ {
+ mod -= dy;
+ delta++;
+ }
+
+ x2 = x + delta;
+ if ( render_scanline( RAS_VAR_ ey1,
+ x, ONE_PIXEL - first, x2, first ) )
+ goto Error;
+ x = x2;
+ ey1 += incr;
+ if ( set_cell( RAS_VAR_ TRUNC( x ), ey1 ) )
+ goto Error;
}
- x2 = x + delta;
- if (render_scanline( RAS_VAR_ ey1, x, ONE_PIXEL-first, x2, first )) goto Error;
- x = x2;
- ey1 += incr;
- if (set_cell( RAS_VAR_ TRUNC(x), ey1 )) goto Error;
}
- }
- if (render_scanline( RAS_VAR_ ey1, x, ONE_PIXEL-first, to_x, fy2 )) goto Error;
-
-Fin:
- ras.x = to_x;
- ras.y = to_y;
- ras.last_ey = SUBPIXELS(ey2);
- return 0;
-Error:
- return 1;
-}
-
-
-static
-void split_conic( FT_Vector* base )
-{
- TPos a, b;
-
- base[4].x = base[2].x;
- b = base[1].x;
- a = base[3].x = ( base[2].x + b )/2;
- b = base[1].x = ( base[0].x + b )/2;
- base[2].x = ( a + b ) / 2;
-
- base[4].y = base[2].y;
- b = base[1].y;
- a = base[3].y = ( base[2].y + b )/2;
- b = base[1].y = ( base[0].y + b )/2;
- base[2].y = ( a + b ) / 2;
-}
-
-
-static
-int render_conic( RAS_ARG_ FT_Vector* control, FT_Vector* to )
-{
- TPos dx, dy;
- int top, level;
- int* levels;
- FT_Vector* arc;
-
- dx = DOWNSCALE(ras.x) + to->x - (control->x << 1); if (dx < 0) dx = -dx;
- dy = DOWNSCALE(ras.y) + to->y - (control->y << 1); if (dy < 0) dy = -dy;
- if (dx < dy) dx = dy;
-
- level = 1;
- dx = dx/ras.conic_level;
- while ( dx > 0 )
- {
- dx >>= 1;
- level++;
+ if ( render_scanline( RAS_VAR_ ey1,
+ x, ONE_PIXEL - first, to_x, fy2 ) )
+ goto Error;
+
+ End:
+ ras.x = to_x;
+ ras.y = to_y;
+ ras.last_ey = SUBPIXELS( ey2 );
+
+ return 0;
+
+ Error:
+ return 1;
}
- /* a shortcut to speed things up */
- if (level <= 1)
+
+ static
+ void split_conic( FT_Vector* base )
{
- /* we compute the mid-point directly in order to avoid */
- /* calling split_conic().. */
- TPos to_x, to_y, mid_x, mid_y;
+ TPos a, b;
- to_x = UPSCALE(to->x);
- to_y = UPSCALE(to->y);
- mid_x = (ras.x + to_x + 2*UPSCALE(control->x))/4;
- mid_y = (ras.y + to_y + 2*UPSCALE(control->y))/4;
- return render_line( RAS_VAR_ mid_x, mid_y ) ||
- render_line( RAS_VAR_ to_x, to_y );
- }
+ base[4].x = base[2].x;
+ b = base[1].x;
+ a = base[3].x = ( base[2].x + b ) / 2;
+ b = base[1].x = ( base[0].x + b ) / 2;
+ base[2].x = ( a + b ) / 2;
- arc = ras.bez_stack;
- levels = ras.lev_stack;
- top = 0;
- levels[0] = level;
+ base[4].y = base[2].y;
+ b = base[1].y;
+ a = base[3].y = ( base[2].y + b ) / 2;
+ b = base[1].y = ( base[0].y + b ) / 2;
+ base[2].y = ( a + b ) / 2;
+ }
- arc[0].x = UPSCALE(to->x);
- arc[0].y = UPSCALE(to->y);
- arc[1].x = UPSCALE(control->x);
- arc[1].y = UPSCALE(control->y);
- arc[2].x = ras.x;
- arc[2].y = ras.y;
- while (top >= 0)
+ static
+ int render_conic( RAS_ARG_ FT_Vector* control,
+ FT_Vector* to )
{
- level = levels[top];
- if (level > 1)
+ TPos dx, dy;
+ int top, level;
+ int* levels;
+ FT_Vector* arc;
+
+
+ dx = DOWNSCALE( ras.x ) + to->x - ( control->x << 1 );
+ if ( dx < 0 )
+ dx = -dx;
+ dy = DOWNSCALE( ras.y ) + to->y - ( control->y << 1 );
+ if ( dy < 0 )
+ dy = -dy;
+ if ( dx < dy )
+ dx = dy;
+
+ level = 1;
+ dx = dx / ras.conic_level;
+ while ( dx > 0 )
{
- /* check that the arc crosses the current band */
- TPos min, max, y;
- min = max = arc[0].y;
- y = arc[1].y;
- if ( y < min ) min = y;
- if ( y > max ) max = y;
- y = arc[2].y;
- if ( y < min ) min = y;
- if ( y > max ) max = y;
- if ( TRUNC(min) >= ras.max_ey || TRUNC(max) < 0 )
- goto Draw;
-
- split_conic(arc);
- arc += 2;
- top ++;
- levels[top] = levels[top-1] = level-1;
- continue;
+ dx >>= 1;
+ level++;
}
- Draw:
+
+ /* a shortcut to speed things up */
+ if ( level <= 1 )
{
+ /* we compute the mid-point directly in order to avoid */
+ /* calling split_conic() */
TPos to_x, to_y, mid_x, mid_y;
- to_x = arc[0].x;
- to_y = arc[0].y;
- mid_x = (ras.x + to_x + 2*arc[1].x)/4;
- mid_y = (ras.y + to_y + 2*arc[1].y)/4;
- if ( render_line( RAS_VAR_ mid_x, mid_y ) ||
- render_line( RAS_VAR_ to_x, to_y ) ) return 1;
- top--;
- arc -= 2;
+ to_x = UPSCALE( to->x );
+ to_y = UPSCALE( to->y );
+ mid_x = ( ras.x + to_x + 2 * UPSCALE( control->x ) ) / 4;
+ mid_y = ( ras.y + to_y + 2 * UPSCALE( control->y ) ) / 4;
+
+ return render_line( RAS_VAR_ mid_x, mid_y ) ||
+ render_line( RAS_VAR_ to_x, to_y );
}
- }
- return 0;
-}
-
-
-static
-void split_cubic( FT_Vector* base )
-{
- TPos a, b, c, d;
-
- base[6].x = base[3].x;
- c = base[1].x;
- d = base[2].x;
- base[1].x = a = ( base[0].x + c ) / 2;
- base[5].x = b = ( base[3].x + d ) / 2;
- c = ( c + d ) / 2;
- base[2].x = a = ( a + c ) / 2;
- base[4].x = b = ( b + c ) / 2;
- base[3].x = ( a + b ) / 2;
-
- base[6].y = base[3].y;
- c = base[1].y;
- d = base[2].y;
- base[1].y = a = ( base[0].y + c ) / 2;
- base[5].y = b = ( base[3].y + d ) / 2;
- c = ( c + d ) / 2;
- base[2].y = a = ( a + c ) / 2;
- base[4].y = b = ( b + c ) / 2;
- base[3].y = ( a + b ) / 2;
-}
-
-
-static
-int render_cubic( RAS_ARG_ FT_Vector* control1,
- FT_Vector* control2,
- FT_Vector* to )
-{
- TPos dx, dy, da, db;
- int top, level;
- int* levels;
- FT_Vector* arc;
-
- dx = DOWNSCALE(ras.x) + to->x - (control1->x << 1); if (dx < 0) dx = -dx;
- dy = DOWNSCALE(ras.y) + to->y - (control1->y << 1); if (dy < 0) dy = -dy;
- if (dx < dy) dx = dy;
- da = dx;
-
- dx = DOWNSCALE(ras.x) + to->x - 3*(control1->x + control2->x); if (dx < 0) dx = -dx;
- dy = DOWNSCALE(ras.y) + to->y - 3*(control1->x + control2->y); if (dy < 0) dy = -dy;
- if (dx < dy) dx = dy;
- db = dx;
-
- level = 1;
- da = da/ras.cubic_level;
- db = db/ras.conic_level;
- while ( da > 0 || db > 0 )
- {
- da >>= 1;
- db >>= 2;
- level++;
- }
- if (level <= 1)
- {
- TPos to_x, to_y, mid_x, mid_y;
+ arc = ras.bez_stack;
+ levels = ras.lev_stack;
+ top = 0;
+ levels[0] = level;
+
+ arc[0].x = UPSCALE( to->x );
+ arc[0].y = UPSCALE( to->y );
+ arc[1].x = UPSCALE( control->x );
+ arc[1].y = UPSCALE( control->y );
+ arc[2].x = ras.x;
+ arc[2].y = ras.y;
+
+ while ( top >= 0 )
+ {
+ level = levels[top];
+ if ( level > 1 )
+ {
+ /* check that the arc crosses the current band */
+ TPos min, max, y;
+
+
+ min = max = arc[0].y;
+
+ y = arc[1].y;
+ if ( y < min ) min = y;
+ if ( y > max ) max = y;
+
+ y = arc[2].y;
+ if ( y < min ) min = y;
+ if ( y > max ) max = y;
+
+ if ( TRUNC( min ) >= ras.max_ey || TRUNC( max ) < 0 )
+ goto Draw;
+
+ split_conic( arc );
+ arc += 2;
+ top++;
+ levels[top] = levels[top - 1] = level - 1;
+ continue;
+ }
+
+ Draw:
+ {
+ TPos to_x, to_y, mid_x, mid_y;
+
+
+ to_x = arc[0].x;
+ to_y = arc[0].y;
+ mid_x = ( ras.x + to_x + 2 * arc[1].x ) / 4;
+ mid_y = ( ras.y + to_y + 2 * arc[1].y ) / 4;
- to_x = UPSCALE(to->x);
- to_y = UPSCALE(to->y);
- mid_x = (ras.x + to_x + 3*UPSCALE(control1->x+control2->x))/8;
- mid_y = (ras.y + to_y + 3*UPSCALE(control1->y+control2->y))/8;
+ if ( render_line( RAS_VAR_ mid_x, mid_y ) ||
+ render_line( RAS_VAR_ to_x, to_y ) )
+ return 1;
- return render_line( RAS_VAR_ mid_x, mid_y ) ||
- render_line( RAS_VAR_ to_x, to_y );
+ top--;
+ arc -= 2;
+ }
+ }
+ return 0;
}
- arc = ras.bez_stack;
- arc[0].x = UPSCALE(to->x);
- arc[0].y = UPSCALE(to->y);
- arc[1].x = UPSCALE(control2->x);
- arc[1].y = UPSCALE(control2->y);
- arc[2].x = UPSCALE(control1->x);
- arc[2].y = UPSCALE(control1->y);
- arc[3].x = ras.x;
- arc[3].y = ras.y;
-
- levels = ras.lev_stack;
- top = 0;
- levels[0] = level;
-
- while (top >= 0)
+
+ static
+ void split_cubic( FT_Vector* base )
{
- level = levels[top];
- if (level > 1)
+ TPos a, b, c, d;
+
+
+ base[6].x = base[3].x;
+ c = base[1].x;
+ d = base[2].x;
+ base[1].x = a = ( base[0].x + c ) / 2;
+ base[5].x = b = ( base[3].x + d ) / 2;
+ c = ( c + d ) / 2;
+ base[2].x = a = ( a + c ) / 2;
+ base[4].x = b = ( b + c ) / 2;
+ base[3].x = ( a + b ) / 2;
+
+ base[6].y = base[3].y;
+ c = base[1].y;
+ d = base[2].y;
+ base[1].y = a = ( base[0].y + c ) / 2;
+ base[5].y = b = ( base[3].y + d ) / 2;
+ c = ( c + d ) / 2;
+ base[2].y = a = ( a + c ) / 2;
+ base[4].y = b = ( b + c ) / 2;
+ base[3].y = ( a + b ) / 2;
+ }
+
+
+ static
+ int render_cubic( RAS_ARG_ FT_Vector* control1,
+ FT_Vector* control2,
+ FT_Vector* to )
+ {
+ TPos dx, dy, da, db;
+ int top, level;
+ int* levels;
+ FT_Vector* arc;
+
+
+ dx = DOWNSCALE( ras.x ) + to->x - ( control1->x << 1 );
+ if ( dx < 0 )
+ dx = -dx;
+ dy = DOWNSCALE( ras.y ) + to->y - ( control1->y << 1 );
+ if ( dy < 0 )
+ dy = -dy;
+ if ( dx < dy )
+ dx = dy;
+ da = dx;
+
+ dx = DOWNSCALE( ras.x ) + to->x - 3 * ( control1->x + control2->x );
+ if ( dx < 0 )
+ dx = -dx;
+ dy = DOWNSCALE( ras.y ) + to->y - 3 * ( control1->x + control2->y );
+ if ( dy < 0 )
+ dy = -dy;
+ if ( dx < dy )
+ dx = dy;
+ db = dx;
+
+ level = 1;
+ da = da / ras.cubic_level;
+ db = db / ras.conic_level;
+ while ( da > 0 || db > 0 )
{
- /* check that the arc crosses the current band */
- TPos min, max, y;
- min = max = arc[0].y;
- y = arc[1].y;
- if ( y < min ) min = y;
- if ( y > max ) max = y;
- y = arc[2].y;
- if ( y < min ) min = y;
- if ( y > max ) max = y;
- y = arc[3].y;
- if ( y < min ) min = y;
- if ( y > max ) max = y;
- if ( TRUNC(min) >= ras.max_ey || TRUNC(max) < 0 )
- goto Draw;
- split_cubic(arc);
- arc += 3;
- top ++;
- levels[top] = levels[top-1] = level-1;
- continue;
+ da >>= 1;
+ db >>= 2;
+ level++;
}
- Draw:
+
+ if ( level <= 1 )
{
TPos to_x, to_y, mid_x, mid_y;
- to_x = arc[0].x;
- to_y = arc[0].y;
- mid_x = (ras.x + to_x + 3*(arc[1].x+arc[2].x))/8;
- mid_y = (ras.y + to_y + 3*(arc[1].y+arc[2].y))/8;
- if ( render_line( RAS_VAR_ mid_x, mid_y ) ||
- render_line( RAS_VAR_ to_x, to_y ) ) return 1;
- top --;
- arc -= 3;
+ to_x = UPSCALE( to->x );
+ to_y = UPSCALE( to->y );
+ mid_x = ( ras.x + to_x +
+ 3 * UPSCALE( control1->x + control2->x ) ) / 8;
+ mid_y = ( ras.y + to_y +
+ 3 * UPSCALE( control1->y + control2->y ) ) / 8;
+
+ return render_line( RAS_VAR_ mid_x, mid_y ) ||
+ render_line( RAS_VAR_ to_x, to_y );
+ }
+
+ arc = ras.bez_stack;
+ arc[0].x = UPSCALE( to->x );
+ arc[0].y = UPSCALE( to->y );
+ arc[1].x = UPSCALE( control2->x );
+ arc[1].y = UPSCALE( control2->y );
+ arc[2].x = UPSCALE( control1->x );
+ arc[2].y = UPSCALE( control1->y );
+ arc[3].x = ras.x;
+ arc[3].y = ras.y;
+
+ levels = ras.lev_stack;
+ top = 0;
+ levels[0] = level;
+
+ while ( top >= 0 )
+ {
+ level = levels[top];
+ if ( level > 1 )
+ {
+ /* check that the arc crosses the current band */
+ TPos min, max, y;
+
+
+ min = max = arc[0].y;
+ y = arc[1].y;
+ if ( y < min ) min = y;
+ if ( y > max ) max = y;
+ y = arc[2].y;
+ if ( y < min ) min = y;
+ if ( y > max ) max = y;
+ y = arc[3].y;
+ if ( y < min ) min = y;
+ if ( y > max ) max = y;
+ if ( TRUNC( min ) >= ras.max_ey || TRUNC( max ) < 0 )
+ goto Draw;
+ split_cubic( arc );
+ arc += 3;
+ top ++;
+ levels[top] = levels[top - 1] = level - 1;
+ continue;
+ }
+
+ Draw:
+ {
+ TPos to_x, to_y, mid_x, mid_y;
+
+
+ to_x = arc[0].x;
+ to_y = arc[0].y;
+ mid_x = ( ras.x + to_x + 3 * ( arc[1].x + arc[2].x ) ) / 8;
+ mid_y = ( ras.y + to_y + 3 * ( arc[1].y + arc[2].y ) ) / 8;
+
+ if ( render_line( RAS_VAR_ mid_x, mid_y ) ||
+ render_line( RAS_VAR_ to_x, to_y ) )
+ return 1;
+ top --;
+ arc -= 3;
+ }
}
+ return 0;
}
- return 0;
-}
-/* a macro comparing two cell pointers. returns true if a <= b */
+ /* a macro comparing two cell pointers. Returns true if a <= b. */
#if 1
-#define PACK(a) ( ((long)(a)->y << 16) | (a)->x )
-#define LESS_THAN(a,b) ( PACK(a) < PACK(b) )
-#else
-#define LESS_THAN(a,b) ( (a)->y<(b)->y || ((a)->y==(b)->y && (a)->x < (b)->x) )
-#endif
-
-#define SWAP_CELLS(a,b,temp) { temp = *(a); *(a) = *(b); *(b) = temp; }
+#define PACK( a ) ( ( (long)(a)->y << 16 ) | (a)->x )
+#define LESS_THAN( a, b ) ( PACK(a) < PACK(b) )
+#else /* 1 */
+#define LESS_THAN( a, b ) ( (a)->y < (b)->y || \
+ ( (a)->y == (b)->y && (a)->x < (b)->x ) )
+#endif /* 1 */
+
+#define SWAP_CELLS( a, b, temp ) do \
+ { \
+ temp = *(a); \
+ *(a) = *(b); \
+ *(b) = temp; \
+ } while ( 0 )
#define DEBUG_SORT
#define QUICK_SORT
#ifdef SHELL_SORT
-/* A simple shell sort algorithm that works directly on our */
-/* cells table.. */
-static
-void shell_sort ( PCell cells,
- int count )
-{
- PCell i, j, limit = cells + count;
- TCell temp;
- int gap;
-
- /* compute initial gap */
- for (gap = 0; ++gap < count; gap *=3 );
- while ( gap /= 3 )
+
+ /* A simple shell sort algorithm that works directly on our */
+ /* cells table.. */
+ static
+ void shell_sort ( PCell cells,
+ int count )
{
- for ( i = cells+gap; i < limit; i++ )
+ PCell i, j, limit = cells + count;
+ TCell temp;
+ int gap;
+
+
+ /* compute initial gap */
+ for ( gap = 0; ++gap < count; gap *= 3 )
+ ;
+
+ while ( gap /= 3 )
{
- for ( j = i-gap; ; j -= gap )
+ for ( i = cells + gap; i < limit; i++ )
{
- PCell k = j+gap;
+ for ( j = i - gap; ; j -= gap )
+ {
+ PCell k = j + gap;
- if ( LESS_THAN(j,k) )
- break;
- SWAP_CELLS(j,k,temp);
+ if ( LESS_THAN( j, k ) )
+ break;
- if ( j < cells+gap )
- break;
+ SWAP_CELLS( j, k, temp );
+
+ if ( j < cells + gap )
+ break;
+ }
}
}
}
-}
-#endif
+#endif /* SHELL_SORT */
+
#ifdef QUICK_SORT
-/* this is a non-recursive quicksort that directly process our cells array */
-/* it should be faster than calling the stdlib qsort(), and we can even */
-/* tailor our insertion threshold... */
-
-#define QSORT_THRESHOLD 9 /* below this size, a sub-array will be sorted */
- /* through a normal insertion sort.. */
-
-static
-void quick_sort( PCell cells,
- int count )
-{
- PCell stack[40]; /* should be enough ;-) */
- PCell* top; /* top of stack */
- PCell base, limit;
- TCell temp;
-
- limit = cells + count;
- base = cells;
- top = stack;
- for (;;)
+
+ /* This is a non-recursive quicksort that directly process our cells */
+ /* array. It should be faster than calling the stdlib qsort(), and we */
+ /* can even tailor our insertion threshold... */
+
+#define QSORT_THRESHOLD 9 /* below this size, a sub-array will be sorted */
+ /* through a normal insertion sort.. */
+
+ static
+ void quick_sort( PCell cells,
+ int count )
{
- int len = limit-base;
- PCell i, j, pivot;
+ PCell stack[40]; /* should be enough ;-) */
+ PCell* top; /* top of stack */
+ PCell base, limit;
+ TCell temp;
+
- if ( len > QSORT_THRESHOLD)
+ limit = cells + count;
+ base = cells;
+ top = stack;
+
+ for (;;)
{
- /* we use base+len/2 as the pivot */
- pivot = base + len/2;
- SWAP_CELLS( base, pivot, temp );
+ int len = limit - base;
+ PCell i, j, pivot;
- i = base + 1;
- j = limit-1;
- /* now ensure that *i <= *base <= *j */
- if (LESS_THAN(j,i))
- SWAP_CELLS( i, j, temp );
+ if ( len > QSORT_THRESHOLD )
+ {
+ /* we use base + len/2 as the pivot */
+ pivot = base + len / 2;
+ SWAP_CELLS( base, pivot, temp );
- if (LESS_THAN(base,i))
- SWAP_CELLS( base, i, temp );
+ i = base + 1;
+ j = limit - 1;
- if (LESS_THAN(j,base))
- SWAP_CELLS( base, j, temp );
+ /* now ensure that *i <= *base <= *j */
+ if ( LESS_THAN( j, i ) )
+ SWAP_CELLS( i, j, temp );
- for (;;)
- {
- do i++; while (LESS_THAN(i,base));
- do j--; while (LESS_THAN(base,j));
- if (i > j)
- break;
+ if ( LESS_THAN( base, i ) )
+ SWAP_CELLS( base, i, temp );
- SWAP_CELLS( i,j, temp );
- }
+ if ( LESS_THAN( j, base ) )
+ SWAP_CELLS( base, j, temp );
+
+ for (;;)
+ {
+ do i++; while ( LESS_THAN( i, base ) );
+ do j--; while ( LESS_THAN( base, j ) );
- SWAP_CELLS( base, j, temp );
+ if ( i > j )
+ break;
- /* now, push the largest sub-array */
- if ( j - base > limit -i )
- {
- top[0] = base;
- top[1] = j;
- base = i;
+ SWAP_CELLS( i, j, temp );
+ }
+
+ SWAP_CELLS( base, j, temp );
+
+ /* now, push the largest sub-array */
+ if ( j - base > limit - i )
+ {
+ top[0] = base;
+ top[1] = j;
+ base = i;
+ }
+ else
+ {
+ top[0] = i;
+ top[1] = limit;
+ limit = j;
+ }
+ top += 2;
}
else
{
- top[0] = i;
- top[1] = limit;
- limit = j;
- }
- top += 2;
- }
- else
- {
- /* the sub-array is small, perform insertion sort */
- j = base;
- i = j+1;
- for ( ; i < limit; j = i, i++ )
- {
- for ( ; LESS_THAN(j+1,j); j-- )
+ /* the sub-array is small, perform insertion sort */
+ j = base;
+ i = j + 1;
+
+ for ( ; i < limit; j = i, i++ )
{
- SWAP_CELLS( j+1, j, temp );
- if (j == base)
- break;
+ for ( ; LESS_THAN( j + 1, j ); j-- )
+ {
+ SWAP_CELLS( j + 1, j, temp );
+ if ( j == base )
+ break;
+ }
}
+ if ( top > stack )
+ {
+ top -= 2;
+ base = top[0];
+ limit = top[1];
+ }
+ else
+ break;
}
- if (top > stack)
- {
- top -= 2;
- base = top[0];
- limit = top[1];
- }
- else
- break;
}
}
-}
-#endif
+
+#endif /* QUICK_SORT */
#ifdef DEBUG_GRAYS
#ifdef DEBUG_SORT
-static
-int check_sort( PCell cells, int count )
-{
- PCell p, q;
- for ( p = cells + count-2; p >= cells; p-- )
+ static
+ int check_sort( PCell cells,
+ int count )
{
- q = p+1;
- if (!LESS_THAN(p,q))
- return 0;
+ PCell p, q;
+
+
+ for ( p = cells + count - 2; p >= cells; p-- )
+ {
+ q = p + 1;
+ if ( !LESS_THAN( p, q ) )
+ return 0;
+ }
+ return 1;
}
- return 1;
-}
-#endif
-#endif
+
+#endif /* DEBUG_SORT */
+#endif /* DEBUG_GRAYS */
static
@@ -962,13 +1070,14 @@ int check_sort( PCell cells, int count )
{
TPos x, y;
+
/* record current cell, if any */
record_cell( (PRaster)raster );
/* start to a new position */
- x = UPSCALE(to->x);
- y = UPSCALE(to->y);
- start_cell( (PRaster)raster, TRUNC(x), TRUNC(y) );
+ x = UPSCALE( to->x );
+ y = UPSCALE( to->y );
+ start_cell( (PRaster)raster, TRUNC( x ), TRUNC( y ) );
((PRaster)raster)->x = x;
((PRaster)raster)->y = y;
return 0;
@@ -979,7 +1088,8 @@ int check_sort( PCell cells, int count )
int Line_To( FT_Vector* to,
FT_Raster raster )
{
- return render_line( (PRaster)raster, UPSCALE(to->x), UPSCALE(to->y) );
+ return render_line( (PRaster)raster,
+ UPSCALE( to->x ), UPSCALE( to->y ) );
}
@@ -1003,32 +1113,39 @@ int check_sort( PCell cells, int count )
static
- void grays_render_span( int y, int count, FT_Span* spans, PRaster raster )
+ void grays_render_span( int y,
+ int count,
+ FT_Span* spans,
+ PRaster raster )
{
- unsigned char *p;
- FT_Bitmap* map = &raster->target;
+ unsigned char* p;
+ FT_Bitmap* map = &raster->target;
+
+
/* first of all, compute the scanline offset */
- p = (unsigned char*)map->buffer - y*map->pitch;
- if (map->pitch >= 0)
- p += (map->rows-1)*map->pitch;
+ p = (unsigned char*)map->buffer - y * map->pitch;
+ if ( map->pitch >= 0 )
+ p += ( map->rows - 1 ) * map->pitch;
for ( ; count > 0; count--, spans++ )
{
- if (spans->coverage)
+ if ( spans->coverage )
#if 1
memset( p + spans->x, (unsigned char)spans->coverage, spans->len );
-#else
+#else /* 1 */
{
q = p + spans->x;
limit = q + spans->len;
for ( ; q < limit; q++ )
q[0] = (unsigned char)spans->coverage;
}
-#endif
+#endif /* 1 */
}
}
+
#ifdef DEBUG_GRAYS
+
#include <stdio.h>
static
@@ -1037,8 +1154,10 @@ int check_sort( PCell cells, int count )
PCell cell, limit;
int y = -1;
- cell = ras.cells;
+
+ cell = ras.cells;
limit = cell + ras.num_cells;
+
for ( ; cell < limit; cell++ )
{
if ( cell->y != y )
@@ -1051,78 +1170,90 @@ int check_sort( PCell cells, int count )
}
fprintf(stderr, "\n" );
}
-#endif
+
+#endif /* DEBUG_GRAYS */
+
static
- void grays_hline( RAS_ARG_ TScan x, TScan y, TPos area, int acount )
+ void grays_hline( RAS_ARG_ TScan x,
+ TScan y,
+ TPos area,
+ int acount )
{
FT_Span* span;
int count;
int coverage;
+
/* compute the coverage line's coverage, depending on the */
- /* outline fill rule.. */
+ /* outline fill rule */
/* */
- /* The coverage percentage is area/(PIXEL_BITS*PIXEL_BITS*2) */
+ /* the coverage percentage is area/(PIXEL_BITS*PIXEL_BITS*2) */
/* */
+ coverage = area >> ( PIXEL_BITS * 2 + 1 - 8); /* use range 0..256 */
- coverage = area >> (PIXEL_BITS*2+1-8); /* use range 0..256 */
if ( ras.outline.flags & ft_outline_even_odd_fill )
{
- if (coverage < 0)
+ if ( coverage < 0 )
coverage = -coverage;
- while (coverage >= 512)
+ while ( coverage >= 512 )
coverage -= 512;
- if (coverage > 256)
+ if ( coverage > 256 )
coverage = 0;
- else if (coverage == 256)
+ else if ( coverage == 256 )
coverage = 255;
}
else
{
/* normal non-zero winding rule */
- if (coverage < 0)
+ if ( coverage < 0 )
coverage = -coverage;
- if (coverage >= 256)
+ if ( coverage >= 256 )
coverage = 255;
}
y += ras.min_ey;
- if (coverage)
+ if ( coverage )
{
/* see if we can add this span to the current list */
count = ras.num_gray_spans;
- span = ras.gray_spans + count-1;
- if (count > 0 && ras.span_y == y && (int)span->x + span->len == (int)x &&
- span->coverage == coverage)
+ span = ras.gray_spans + count - 1;
+ if ( count > 0 &&
+ ras.span_y == y &&
+ (int)span->x + span->len == (int)x &&
+ span->coverage == coverage )
{
span->len += acount;
return;
}
- if ( ras.span_y != y || count >= FT_MAX_GRAY_SPANS)
+ if ( ras.span_y != y || count >= FT_MAX_GRAY_SPANS )
{
- if (ras.render_span)
+ if ( ras.render_span )
ras.render_span( ras.span_y, count, ras.gray_spans,
ras.render_span_data );
/* ras.render_span( span->y, ras.gray_spans, count ); */
#ifdef DEBUG_GRAYS
- if (ras.span_y >= 0)
+
+ if ( ras.span_y >= 0 )
{
- int n;
- fprintf( stderr, "y=%3d ", ras.span_y );
- span = ras.gray_spans;
- for (n = 0; n < count; n++, span++)
- fprintf( stderr, "[%d..%d]:%02x ",
- span->x, span->x + span->len-1, span->coverage );
- fprintf( stderr, "\n" );
+ int n;
+
+
+ fprintf( stderr, "y=%3d ", ras.span_y );
+ span = ras.gray_spans;
+ for ( n = 0; n < count; n++, span++ )
+ fprintf( stderr, "[%d..%d]:%02x ",
+ span->x, span->x + span->len - 1, span->coverage );
+ fprintf( stderr, "\n" );
}
-#endif
+
+#endif /* DEBUG_GRAYS */
ras.num_gray_spans = 0;
ras.span_y = y;
@@ -1143,18 +1274,19 @@ int check_sort( PCell cells, int count )
static
- void grays_sweep( RAS_ARG_ FT_Bitmap* target )
+ void grays_sweep( RAS_ARG_ FT_Bitmap* target )
{
TScan x, y, cover, area;
PCell start, cur, limit;
- target=target;
+ UNUSED( target );
+
cur = ras.cells;
limit = cur + ras.num_cells;
- cover = 0;
- ras.span_y = -1;
+ cover = 0;
+ ras.span_y = -1;
ras.num_gray_spans = 0;
for (;;)
@@ -1170,7 +1302,7 @@ int check_sort( PCell cells, int count )
for (;;)
{
++cur;
- if (cur >= limit || cur->y != start->y || cur->x != start->x)
+ if ( cur >= limit || cur->y != start->y || cur->x != start->x )
break;
area += cur->area;
@@ -1178,57 +1310,67 @@ int check_sort( PCell cells, int count )
}
/* if the start cell has a non-null area, we must draw an */
- /* individual gray pixel there.. */
- if (area && x >= 0)
+ /* individual gray pixel there */
+ if ( area && x >= 0 )
{
- grays_hline( RAS_VAR_ x, y, cover*(ONE_PIXEL*2)-area, 1 );
+ grays_hline( RAS_VAR_ x, y, cover * ( ONE_PIXEL * 2 ) - area, 1 );
x++;
}
- if (x < 0)
+ if ( x < 0 )
x = 0;
- if (cur < limit && start->y == cur->y)
+ if ( cur < limit && start->y == cur->y )
{
/* draw a gray span between the start cell and the current one */
- if (cur->x > x)
- grays_hline( RAS_VAR_ x, y, cover*(ONE_PIXEL*2), cur->x - x );
+ if ( cur->x > x )
+ grays_hline( RAS_VAR_ x, y,
+ cover * ( ONE_PIXEL * 2 ), cur->x - x );
}
else
{
/* draw a gray span until the end of the clipping region */
- if (cover && x < ras.max_ex)
- grays_hline( RAS_VAR_ x, y, cover*(ONE_PIXEL*2), ras.max_ex - x );
+ if ( cover && x < ras.max_ex )
+ grays_hline( RAS_VAR_ x, y,
+ cover * ( ONE_PIXEL * 2 ), ras.max_ex - x );
cover = 0;
}
- if (cur >= limit)
+ if ( cur >= limit )
break;
}
- if (ras.render_span && ras.num_gray_spans > 0)
+ if ( ras.render_span && ras.num_gray_spans > 0 )
ras.render_span( ras.span_y, ras.num_gray_spans,
ras.gray_spans, ras.render_span_data );
+
#ifdef DEBUG_GRAYS
+
{
int n;
FT_Span* span;
+
fprintf( stderr, "y=%3d ", ras.span_y );
span = ras.gray_spans;
- for (n = 0; n < ras.num_gray_spans; n++, span++)
- fprintf( stderr, "[%d..%d]:%02x ", span->x, span->x+span->len-1,span->coverage );
+ for ( n = 0; n < ras.num_gray_spans; n++, span++ )
+ fprintf( stderr, "[%d..%d]:%02x ",
+ span->x, span->x + span->len - 1, span->coverage );
fprintf( stderr, "\n" );
}
-#endif
+
+#endif /* DEBUG_GRAYS */
+
}
- typedef struct TBand_
+
+ typedef struct TBand_
{
FT_Pos min, max;
} TBand;
+
static
int grays_convert_glyph( RAS_ARG_ FT_Outline* outline )
{
@@ -1247,6 +1389,7 @@ int check_sort( PCell cells, int count )
int n, num_bands;
TPos min, max, max_y;
+
/* Set up state in the raster object */
compute_cbox( RAS_VAR_ outline );
@@ -1255,51 +1398,56 @@ int check_sort( PCell cells, int count )
ras.max_ey <= 0 || ras.min_ey >= ras.target.rows )
return 0;
- if (ras.min_ex < 0) ras.min_ex = 0;
- if (ras.min_ey < 0) ras.min_ey = 0;
+ if ( ras.min_ex < 0 ) ras.min_ex = 0;
+ if ( ras.min_ey < 0 ) ras.min_ey = 0;
- if (ras.max_ex > ras.target.width) ras.max_ex = ras.target.width;
- if (ras.max_ey > ras.target.rows) ras.max_ey = ras.target.rows;
+ if ( ras.max_ex > ras.target.width ) ras.max_ex = ras.target.width;
+ if ( ras.max_ey > ras.target.rows ) ras.max_ey = ras.target.rows;
/* simple heuristic used to speed-up the bezier decomposition */
/* see the code in render_conic and render_cubic for more details */
ras.conic_level = 32;
ras.cubic_level = 16;
+
{
int level = 0;
- if (ras.max_ex > 24 || ras.max_ey > 24)
+
+
+ if ( ras.max_ex > 24 || ras.max_ey > 24 )
level++;
- if (ras.max_ex > 120 || ras.max_ey > 120)
- level+=2;
+ if ( ras.max_ex > 120 || ras.max_ey > 120 )
+ level += 2;
ras.conic_level <<= level;
ras.cubic_level <<= level;
}
/* setup vertical bands */
- num_bands = (ras.max_ey - ras.min_ey)/ras.band_size;
- if (num_bands == 0) num_bands = 1;
- if (num_bands >= 39) num_bands = 39;
+ num_bands = ( ras.max_ey - ras.min_ey ) / ras.band_size;
+ if ( num_bands == 0 ) num_bands = 1;
+ if ( num_bands >= 39 ) num_bands = 39;
ras.band_shoot = 0;
min = ras.min_ey;
max_y = ras.max_ey;
+
for ( n = 0; n < num_bands; n++, min = max )
{
max = min + ras.band_size;
- if (n == num_bands-1 || max > max_y)
+ if ( n == num_bands - 1 || max > max_y )
max = max_y;
bands[0].min = min;
bands[0].max = max;
band = bands;
- while (band >= bands)
+ while ( band >= bands )
{
FT_Pos bottom, top, middle;
int error;
+
ras.num_cells = 0;
ras.invalid = 1;
ras.min_ey = band->min;
@@ -1308,18 +1456,18 @@ int check_sort( PCell cells, int count )
error = FT_Outline_Decompose( outline, &interface, &ras ) ||
record_cell( RAS_VAR );
- if (!error)
+ if ( !error )
{
- #ifdef SHELL_SORT
+#ifdef SHELL_SORT
shell_sort( ras.cells, ras.num_cells );
- #else
+#else
quick_sort( ras.cells, ras.num_cells );
- #endif
+#endif
- #ifdef DEBUG_GRAYS
+#ifdef DEBUG_GRAYS
check_sort( ras.cells, ras.num_cells );
dump_cells( RAS_VAR );
- #endif
+#endif
grays_sweep( RAS_VAR_ &ras.target );
band--;
@@ -1329,19 +1477,19 @@ int check_sort( PCell cells, int count )
/* render pool overflow, we will reduce the render band by half */
bottom = band->min;
top = band->max;
- middle = bottom + ((top-bottom) >> 1);
+ middle = bottom + ( ( top - bottom ) >> 1 );
- /* waoow !! this is too complex for a single scanline, something */
- /* must be really rotten here !! */
- if (middle == bottom)
+ /* waoow! This is too complex for a single scanline, something */
+ /* must be really rotten here! */
+ if ( middle == bottom )
{
- #ifdef DEBUG_GRAYS
- fprintf( stderr, "Rotten glyph !!\n" );
- #endif
+#ifdef DEBUG_GRAYS
+ fprintf( stderr, "Rotten glyph!\n" );
+#endif
return 1;
}
- if (bottom-top >= ras.band_size)
+ if ( bottom-top >= ras.band_size )
ras.band_shoot++;
band[1].min = bottom;
@@ -1352,8 +1500,8 @@ int check_sort( PCell cells, int count )
}
}
- if (ras.band_shoot > 8 && ras.band_size > 16)
- ras.band_size = ras.band_size/2;
+ if ( ras.band_shoot > 8 && ras.band_size > 16 )
+ ras.band_size = ras.band_size / 2;
return 0;
}
@@ -1366,6 +1514,7 @@ int check_sort( PCell cells, int count )
FT_Outline* outline = (FT_Outline*)params->source;
FT_Bitmap* target_map = params->target;
+
if ( !raster || !raster->cells || !raster->max_cells )
return -1;
@@ -1376,13 +1525,14 @@ int check_sort( PCell cells, int count )
if ( !outline || !outline->contours || !outline->points )
return -1;
- if ( outline->n_points != outline->contours[outline->n_contours - 1] + 1 )
+ if ( outline->n_points !=
+ outline->contours[outline->n_contours - 1] + 1 )
return -1;
if ( !target_map || !target_map->buffer )
return -1;
- /* XXXX: this version does not support monochrome rendering yet ! */
+ /* XXXX: this version does not support monochrome rendering yet! */
if ( !(params->flags & ft_raster_flag_aa) )
return -1;
@@ -1393,6 +1543,7 @@ int check_sort( PCell cells, int count )
ras.render_span = (FT_Raster_Span_Func)grays_render_span;
ras.render_span_data = &ras;
+
if ( params->flags & ft_raster_flag_direct )
{
ras.render_span = (FT_Raster_Span_Func)params->gray_spans;
@@ -1405,17 +1556,22 @@ int check_sort( PCell cells, int count )
/**** RASTER OBJECT CREATION : in standalone mode, we simply use *****/
/**** a static object .. *****/
+
#ifdef _STANDALONE_
static
- int grays_raster_new( void* memory, FT_Raster *araster )
+ int grays_raster_new( void* memory,
+ FT_Raster* araster )
{
static FT_RasterRec_ the_raster;
+
+
*araster = &the_raster;
- memset( &the_raster, sizeof(the_raster), 0 );
+ memset( &the_raster, sizeof ( the_raster ), 0 );
return 0;
}
+
static
void grays_raster_done( FT_Raster raster )
{
@@ -1423,18 +1579,18 @@ int check_sort( PCell cells, int count )
(void)raster;
}
-#else
-
-#include <freetype/internal/ftobjs.h>
+#else /* _STANDALONE_ */
static
- int grays_raster_new( FT_Memory memory, FT_Raster* araster )
+ int grays_raster_new( FT_Memory memory,
+ FT_Raster* araster )
{
FT_Error error;
PRaster raster;
+
*araster = 0;
- if ( !ALLOC( raster, sizeof(TRaster) ))
+ if ( !ALLOC( raster, sizeof ( TRaster ) ) )
{
raster->memory = memory;
*araster = (FT_Raster)raster;
@@ -1443,29 +1599,31 @@ int check_sort( PCell cells, int count )
return error;
}
+
static
void grays_raster_done( FT_Raster raster )
{
FT_Memory memory = (FT_Memory)((PRaster)raster)->memory;
- FREE( raster );
- }
-#endif
+ FREE( raster );
+ }
+#endif /* _STANDALONE_ */
static
void grays_raster_reset( FT_Raster raster,
- const char* pool_base,
- long pool_size )
+ const char* pool_base,
+ long pool_size )
{
PRaster rast = (PRaster)raster;
- if (raster && pool_base && pool_size >= 4096)
+
+ if ( raster && pool_base && pool_size >= 4096 )
init_cells( rast, (char*)pool_base, pool_size );
- rast->band_size = (pool_size / sizeof(TCell))/8;
+ rast->band_size = ( pool_size / sizeof ( TCell ) ) / 8;
}
@@ -1473,10 +1631,12 @@ int check_sort( PCell cells, int count )
{
ft_glyph_format_outline,
- (FT_Raster_New_Func) grays_raster_new,
- (FT_Raster_Reset_Func) grays_raster_reset,
- (FT_Raster_Set_Mode_Func) 0,
- (FT_Raster_Render_Func) grays_raster_render,
- (FT_Raster_Done_Func) grays_raster_done
+ (FT_Raster_New_Func) grays_raster_new,
+ (FT_Raster_Reset_Func) grays_raster_reset,
+ (FT_Raster_Set_Mode_Func)0,
+ (FT_Raster_Render_Func) grays_raster_render,
+ (FT_Raster_Done_Func) grays_raster_done
};
+
+/* END */