Commit 3b2c50eb3b7863131ea18350a3ae5d48fbc567b9
2000-08-23T21:11:13
completing the FreeType Cache subsystem files
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
diff --git a/CHANGES b/CHANGES
index aaa7de5..339d5b4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
LATEST CHANGES
+ - added the cache sub-system. See <freetype/ftcache.h> as well as the
+ sources in "src/cache". Note that it compiles but is still untested
+ for now ..
+
- updated "docs/docmaker.py", a draft API reference is available at
http://www.freetype.org/ft2api.html
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
new file mode 100644
index 0000000..37ec8ad
--- /dev/null
+++ b/include/freetype/ftcache.h
@@ -0,0 +1,451 @@
+/***************************************************************************/
+/* */
+/* ftcache.h */
+/* */
+/* FreeType Cache subsystem */
+/* */
+/* Copyright 1996-2000 by */
+/* David Turner, Robert Wilhelm, and Werner Lemberg. */
+/* */
+/* This file is part of the FreeType project, and may only be used, */
+/* modified, and distributed under the terms of the FreeType project */
+/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
+/* this file you indicate that you have read the license and */
+/* understand and accept it fully. */
+/* */
+/***************************************************************************/
+
+#ifndef FTCACHE_H
+#define FTCACHE_H
+
+#include <freetype/ftglyph.h>
+
+
+
+ /**************************************************************************/
+ /**************************************************************************/
+ /**************************************************************************/
+ /***** *****/
+ /***** 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
+ *
+ **************************************************************************/
+
+ 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
+ *
+ **************************************************************************/
+
+ 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
+ *
+ **************************************************************************/
+
+ typedef struct FTC_SizeRec_
+ {
+ FTC_FaceID face_id;
+ FT_UShort pix_width;
+ FT_UShort pix_height;
+
+ } FTC_SizeRec;
+
+
+ /**************************************************************************
+ *
+ * <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.
+ *
+ **************************************************************************/
+
+ 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
+ *
+ * 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
+ *
+ **************************************************************************/
+
+ FT_EXPORT_DEF( FT_Error ) FTC_Manager_New( FT_Library library,
+ 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..
+ *
+ **************************************************************************/
+
+ 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..
+ *
+ **************************************************************************/
+
+ 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
+ *
+ **************************************************************************/
+
+ typedef enum FTC_Image_Type_
+ {
+ ftc_image_mono = 0, /* monochrome bitmap */
+ ftc_image_grays, /* anti-aliased bitmap */
+ ftc_image_outline, /* scaled outline */
+ ftc_image_master_outline /* original outline */
+
+ } 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_
+ {
+ FTC_SizeRec size;
+ FT_UInt image_type;
+
+ } 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..
+ *
+ **************************************************************************/
+
+ 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
+ *
+ **************************************************************************/
+
+ 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 ;-)
+ *
+ **************************************************************************/
+
+ FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_Lookup(
+ FTC_Image_Cache cache,
+ FTC_Image_Desc* desc,
+ FT_UInt gindex,
+ FT_Glyph* aglyph );
+
+
+#endif /* FTCACHE_H */
diff --git a/src/cache/ftcache.c b/src/cache/ftcache.c
new file mode 100644
index 0000000..a56e476
--- /dev/null
+++ b/src/cache/ftcache.c
@@ -0,0 +1,36 @@
+/***************************************************************************/
+/* */
+/* ftcache.c */
+/* */
+/* The FreeType Caching sub-system */
+/* */
+/* Copyright 1996-2000 by */
+/* David Turner, Robert Wilhelm, and Werner Lemberg. */
+/* */
+/* This file is part of the FreeType project, and may only be used, */
+/* modified, and distributed under the terms of the FreeType project */
+/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
+/* this file you indicate that you have read the license and */
+/* understand and accept it fully. */
+/* */
+/***************************************************************************/
+
+
+#define FT_MAKE_OPTION_SINGLE_OBJECT
+
+#ifdef FT_FLAT_COMPILE
+
+#include "ftlru.c"
+#include "ftcmanag.c"
+#include "ftcimage.c"
+
+#else
+
+#include <cache/ftlru.c>
+#include <cache/ftcmanag.c>
+#include <cache/ftcimage.c>
+
+#endif
+
+
+/* END */
diff --git a/src/cache/ftcimage.c b/src/cache/ftcimage.c
index d2df6a6..e73b9da 100644
--- a/src/cache/ftcimage.c
+++ b/src/cache/ftcimage.c
@@ -17,6 +17,59 @@
#include <cache/ftcimage.h>
+#include <freetype/fterrors.h>
+#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 *****/
+ /***** *****/
+ /***********************************************************************/
+ /***********************************************************************/
+
+
+ static
+ 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) ))
+ *anode = node;
+
+ return error;
+ }
+
+
+ static
+ 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.. */
+ FT_Memory memory = cache->memory;
+ FREE( node );
+ }
+
+
+
+ /***********************************************************************/
+ /***********************************************************************/
+ /***** *****/
+ /***** GLYPH IMAGE QUEUES *****/
+ /***** *****/
+ /***********************************************************************/
+ /***********************************************************************/
+
static
void ftc_done_glyph_image( FTC_Image_Queue queue,
@@ -43,7 +96,7 @@
if ( pitch < 0 )
pitch = -pitch;
- return (FT_ULong)(pitch * glyph->bitmap->rows + sizeof ( *glyph ) );
+ return (FT_ULong)(pitch * glyph->bitmap.rows + sizeof ( *glyph ) );
}
@@ -51,7 +104,6 @@
FT_ULong ftc_size_outline_image( FTC_Image_Queue queue,
FTC_ImageNode node )
{
- FT_Long pitch;
FT_OutlineGlyph glyph;
FT_Outline* outline;
@@ -68,14 +120,6 @@
}
- /*************************************************************************/
- /*************************************************************************/
- /***** *****/
- /***** MONOCHROME BITMAP CALLBACKS *****/
- /***** *****/
- /*************************************************************************/
- /*************************************************************************/
-
static
FT_Error ftc_init_mono_image( FTC_Image_Queue queue,
FTC_ImageNode node )
@@ -84,20 +128,19 @@
FT_Size size;
FT_Error error;
-
error = FTC_Manager_Lookup_Size( queue->manager,
- &queue->size_rec,
+ &queue->descriptor.size,
&face, &size );
if ( !error )
{
- FT_UInt glyph_index = FTC_IMAGENODE_GINDEX( node );
+ FT_UInt glyph_index = FTC_IMAGENODE_GET_GINDEX( node );
error = FT_Load_Glyph( face, glyph_index,
FT_LOAD_RENDER | FT_LOAD_MONOCHROME );
if ( !error )
{
- if ( face->glyph->format != ft_image_format_bitmap ||
+ if ( face->glyph->format != ft_glyph_format_bitmap ||
face->glyph->bitmap.pixel_mode != ft_pixel_mode_mono )
{
/* there is no monochrome glyph for this font! */
@@ -129,21 +172,106 @@
error = FTC_Manager_Lookup_Size( queue->manager,
- &queue->size_rec,
+ &queue->descriptor.size,
&face, &size );
if ( !error )
{
- FT_UInt glyph_index = FTC_IMAGENODE_GINDEX( node );
+ FT_UInt glyph_index = FTC_IMAGENODE_GET_GINDEX( node );
error = FT_Load_Glyph( face, glyph_index,
FT_LOAD_RENDER );
if ( !error )
{
- if ( face->glyph->format != ft_image_format_bitmap ||
+ if ( face->glyph->format != ft_glyph_format_bitmap ||
face->glyph->bitmap.pixel_mode != ft_pixel_mode_grays )
{
- /* there is no monochrome glyph for this font! */
+ /* there is no anti-aliased glyph for this font! */
+ error = FT_Err_Invalid_Glyph_Index;
+ }
+ else
+ {
+ /* ok, copy it */
+ FT_Glyph glyph;
+
+
+ error = FT_Get_Glyph( face->glyph, &glyph );
+ if ( !error )
+ FTC_IMAGENODE_SET_GLYPH( node, glyph );
+ }
+ }
+ }
+ return error;
+ }
+
+
+ static
+ FT_Error ftc_init_outline_image( FTC_Image_Queue queue,
+ FTC_ImageNode node )
+ {
+ FT_Face face;
+ FT_Size size;
+ FT_Error error;
+
+
+ error = FTC_Manager_Lookup_Size( queue->manager,
+ &queue->descriptor.size,
+ &face, &size );
+ if ( !error )
+ {
+ FT_UInt glyph_index = FTC_IMAGENODE_GET_GINDEX( node );
+
+
+ error = FT_Load_Glyph( face, glyph_index,
+ FT_LOAD_NO_BITMAP );
+ if ( !error )
+ {
+ if ( face->glyph->format != ft_glyph_format_outline )
+ {
+ /* there is no outline glyph for this font! */
+ error = FT_Err_Invalid_Glyph_Index;
+ }
+ else
+ {
+ /* ok, copy it */
+ FT_Glyph glyph;
+
+
+ error = FT_Get_Glyph( face->glyph, &glyph );
+ if ( !error )
+ FTC_IMAGENODE_SET_GLYPH( node, glyph );
+ }
+ }
+ }
+ return error;
+ }
+
+
+
+ static
+ FT_Error ftc_init_master_outline_image( FTC_Image_Queue queue,
+ FTC_ImageNode node )
+ {
+ FT_Face face;
+ FT_Size size;
+ FT_Error error;
+
+
+ error = FTC_Manager_Lookup_Size( queue->manager,
+ &queue->descriptor.size,
+ &face, &size );
+ if ( !error )
+ {
+ FT_UInt glyph_index = FTC_IMAGENODE_GET_GINDEX( node );
+
+
+ error = FT_Load_Glyph( face, glyph_index,
+ FT_LOAD_NO_SCALE | FT_LOAD_NO_BITMAP );
+ if ( !error )
+ {
+ if ( face->glyph->format != ft_glyph_format_outline )
+ {
+ /* there is no outline glyph for this font! */
error = FT_Err_Invalid_Glyph_Index;
}
else
@@ -162,4 +290,385 @@
}
+ static
+ const FTC_Image_Class ftc_mono_image_class =
+ {
+ ftc_init_mono_image,
+ ftc_done_glyph_image,
+ ftc_size_bitmap_image
+ };
+
+ static
+ const FTC_Image_Class ftc_gray_image_class =
+ {
+ ftc_init_gray_image,
+ ftc_done_glyph_image,
+ ftc_size_bitmap_image
+ };
+
+ static
+ const FTC_Image_Class ftc_outline_image_class =
+ {
+ ftc_init_outline_image,
+ ftc_done_glyph_image,
+ ftc_size_outline_image
+ };
+
+ static
+ const FTC_Image_Class ftc_master_outline_image_class =
+ {
+ ftc_init_master_outline_image,
+ ftc_done_glyph_image,
+ ftc_size_outline_image
+ };
+
+
+ static
+ 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;
+ FTC_Manager manager = cache->manager;
+ FTC_Image_Queue queue = 0;
+
+ const FTC_Image_Class* clazz;
+
+ *aqueue = 0;
+ if ( ALLOC( queue, sizeof(*queue) ) )
+ goto Exit;
+
+ queue->cache = cache;
+ queue->manager = manager;
+ queue->memory = memory;
+ queue->descriptor = *desc;
+ queue->hash_size = 32;
+
+ if ( ALLOC_ARRAY( queue->buckets, queue->hash_size, FT_ListRec ) )
+ goto Exit;
+
+ switch (desc->image_type)
+ {
+ case ftc_image_mono:
+ clazz = &ftc_mono_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_master_outline:
+ clazz = &ftc_master_outline_image_class;
+ break;
+
+ default:
+ /* invalid image type !! */
+ error = FT_Err_Invalid_Argument;
+ goto Exit;
+ }
+
+ queue->clazz = (FTC_Image_Class*)clazz;
+ *aqueue = queue;
+ Exit:
+ if (error)
+ FREE( queue );
+
+ return error;
+ }
+
+
+ static
+ void FTC_Image_Queue_Done( FTC_Image_Queue queue )
+ {
+ FTC_Image_Cache cache = queue->cache;
+ FT_List glyphs_lru = &cache->glyphs_lru;
+ FT_List bucket = queue->buckets;
+ 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++ )
+ {
+ FT_ListNode node = bucket->head;
+ FT_ListNode next = 0;
+ FT_ListNode lrunode;
+ FTC_ImageNode inode;
+
+ for ( ; node; node = next )
+ {
+ next = node->next;
+ inode = (FTC_ImageNode)node;
+ lrunode = FTC_IMAGENODE_TO_LISTNODE(inode);
+
+ queue->clazz->done_image( queue, inode );
+ FT_List_Remove( glyphs_lru, lrunode );
+
+ FTC_ImageNode_Done( cache, inode );
+ }
+
+ bucket->head = bucket->tail = 0;
+ }
+ FREE( queue->buckets );
+ FREE( queue );
+ }
+
+
+ static
+ FT_Error FTC_Image_Queue_Lookup_Node( FTC_Image_Queue queue,
+ FT_UInt glyph_index,
+ FTC_ImageNode *anode )
+ {
+ FTC_Image_Cache cache = queue->cache;
+ FT_UInt hash_index = glyph_index % queue->hash_size;
+ FT_List bucket = queue->buckets + hash_index;
+ FT_ListNode node, next;
+ 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 )
+ {
+ /* we found it !! - move glyph to start of the list */
+ FT_List_Up( bucket, node );
+ *anode = inode;
+ return 0;
+ }
+ }
+
+ /* we didn't found the glyph image, we will now create a new one */
+ error = FTC_ImageNode_New( queue->cache, &inode );
+ if (error)
+ goto Exit;
+
+ error = queue->clazz->init_image( queue, inode );
+ if (error)
+ {
+ FTC_ImageNode_Done( queue->cache, inode );
+ goto Exit;
+ }
+
+ /* set the glyph and queue indices in the image node */
+ FTC_IMAGENODE_SET_INDICES( inode, glyph_index, queue->index );
+
+ /* insert the node at the start of our bucket list */
+ 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) );
+
+ cache->num_bytes += queue->clazz->size_image(queue,inode);
+
+ *anode = inode;
+
+ Exit:
+ return error;
+ }
+
+
+
+ /***********************************************************************/
+ /***********************************************************************/
+ /***** *****/
+ /***** 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)
+
+ static
+ 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;
+ FT_Error error;
+ FTC_Image_Queue queue;
+
+ error = FTC_Image_Queue_New( cache, desc, &queue );
+ if (!error)
+ {
+ /* good, now set the queue index within the queue object */
+ queue->index = node - lru->nodes;
+ node->root.data = queue;
+ }
+
+ return error;
+ }
+
+
+ static
+ void ftc_image_cache_done_queue( FT_Lru lru,
+ FT_LruNode node )
+ {
+ FTC_Image_Queue queue = FTC_LRUNODE_QUEUE(node);
+
+ FT_UNUSED(lru);
+ FTC_Image_Queue_Done(queue);
+ }
+
+
+ static
+ FT_Bool ftc_image_cache_compare_queue( FT_LruNode node,
+ FT_LruKey key )
+ {
+ 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 );
+ }
+
+
+
+ static
+ const FT_Lru_Class ftc_image_queue_lru_class =
+ {
+ sizeof( FT_LruRec ),
+ ftc_image_cache_init_queue,
+ ftc_image_cache_done_queue,
+ 0, /* no flush */
+ ftc_image_cache_compare_queue
+ };
+
+
+
+
+
+ /* 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".. */
+ static
+ void FTC_Image_Cache_Compress( FTC_Image_Cache cache,
+ FTC_ImageNode new_node )
+ {
+ while (cache->num_bytes > cache->max_bytes)
+ {
+ FT_ListNode cur = cache->glyphs_lru.tail;
+ FTC_Image_Queue queue;
+ FT_UInt glyph_index;
+ FT_UInt hash_index;
+ FT_UInt queue_index;
+ 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..) */
+
+ 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;
+ hash_index = glyph_index % queue->hash_size;
+ size = queue->clazz->size_image( queue, inode );
+
+ FT_List_Remove( &cache->glyphs_lru, cur );
+ FT_List_Remove( queue->buckets + hash_index, (FT_ListNode)inode );
+ queue->clazz->done_image( queue, inode );
+ FTC_ImageNode_Done( cache, inode );
+
+ cache->num_bytes -= size;
+ }
+ }
+
+
+ FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_New( FTC_Manager manager,
+ FT_ULong max_bytes,
+ FTC_Image_Cache* acache )
+ {
+ FT_Error error;
+ FT_Memory memory;
+ FTC_Image_Cache cache;
+
+
+ *acache = 0;
+ memory = manager->library->memory;
+
+ if ( ALLOC( cache, sizeof(*cache) ) )
+ goto Exit;
+
+ cache->manager = manager;
+ cache->max_bytes = max_bytes;
+
+ error = FT_Lru_New( &ftc_image_queue_lru_class,
+ FTC_MAX_IMAGE_QUEUES,
+ cache,
+ memory,
+ 1, /* pre_alloc == TRUE */
+ &cache->queues_lru );
+ if (error)
+ goto Exit;
+
+ *acache = cache;
+
+ Exit:
+ if ( error )
+ FREE( cache );
+
+ return error;
+ }
+
+
+
+ FT_EXPORT_DEF( void ) FTC_Image_Cache_Done( FTC_Image_Cache cache )
+ {
+ FT_Memory memory = cache->memory;
+
+
+ /* discard image queues */
+ FT_Lru_Done( cache->queues_lru );
+
+ /* discard cache */
+ FREE( cache );
+ }
+
+
+
+ FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_Lookup(
+ FTC_Image_Cache cache,
+ FTC_Image_Desc* desc,
+ FT_UInt gindex,
+ FT_Glyph* aglyph )
+ {
+ FT_Error error;
+ FTC_Image_Queue queue;
+ FTC_ImageNode inode;
+
+ *aglyph = 0;
+ error = FT_Lru_Lookup( cache->queues_lru,
+ (FT_LruKey)desc,
+ (FT_Pointer*)&queue );
+ if (error)
+ goto Exit;
+
+ error = FTC_Image_Queue_Lookup_Node( queue, gindex, &inode );
+ if (error)
+ goto Exit;
+
+ FTC_Image_Cache_Compress( cache, inode );
+ *aglyph = FTC_IMAGENODE_GET_GLYPH(inode);
+
+ Exit:
+ return error;
+ }
+
+
/* END */
diff --git a/src/cache/ftcimage.h b/src/cache/ftcimage.h
index 5a4d17f..11eb96e 100644
--- a/src/cache/ftcimage.h
+++ b/src/cache/ftcimage.h
@@ -21,40 +21,18 @@
#include <cache/ftcmanag.h>
#include <freetype/ftglyph.h>
-
+#include <stddef.h>
#ifdef __cplusplus
extern "C" {
#endif
+#define FTC_MAX_IMAGE_QUEUES 16
typedef struct FTC_Image_QueueRec_* FTC_Image_Queue;
- typedef struct FTC_Image_CacheRec_* FTC_Image_Cache;
typedef struct FTC_ImageNodeRec_* FTC_ImageNode;
- /* types of glyph images */
- typedef enum FTC_Image_Type_
- {
- ftc_image_mono = 0, /* monochrome bitmap */
- ftc_image_grays, /* anti-aliased bitmap */
- ftc_image_outline, /* scaled outline */
- ftc_image_master_outline, /* original outline */
-
- } FTC_Image_Type;
-
-
- /* a descriptor used to describe all glyphs in a given queue */
- typedef struct FTC_Image_Desc_
- {
- FTC_FaceID face_id;
- FT_UInt pix_width;
- FT_UInt pix_height;
- FT_UInt image_type;
-
- } FTC_Image_Desc;
-
-
/* macros used to pack a glyph index and a queue index in a single ptr */
#define FTC_PTR_TO_GINDEX( p ) ( (FT_UInt)( (FT_ULong)(p) >> 16 ) )
#define FTC_PTR_TO_QINDEX( p ) ( (FT_UInt)( (FT_ULong)(p) & 0xFFFF ) )
@@ -76,13 +54,26 @@
/* 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_SET_INDICES( g, q ) \
+#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 \
{ \
(n)->root2.data = FTC_INDICES_TO_PTR( g, q ); \
} while ( 0 )
+ /* 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)
+
+ /* 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)))
+
+
typedef struct FTC_Image_CacheRec_
{
FTC_Manager manager;
@@ -91,22 +82,23 @@
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_Lru queues_lru; /* static queues lru list */
+ FT_ListRec glyphs_lru; /* global lru list of glyph images */
- } FTC_Image_Cache;
+ } FTC_Image_CacheRec;
/* a table of functions used to generate/manager glyph images */
typedef struct FTC_Image_Class_
{
FT_Error (*init_image)( FTC_Image_Queue queue,
- FTC_Image_Node node );
+ FTC_ImageNode node );
void (*done_image)( FTC_Image_Queue queue,
- FTC_Image_Node node );
+ FTC_ImageNode node );
FT_ULong (*size_image)( FTC_Image_Queue queue,
- FTC_Image_Node node );
+ FTC_ImageNode node );
} FTC_Image_Class;
@@ -120,21 +112,10 @@
FTC_Image_Desc descriptor;
FT_UInt hash_size;
FT_List buckets;
+ FT_UInt index; /* index in parent cache */
- } FTC_Image_SubCacheRec;
-
+ } FTC_Image_QueueRec;
- FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_New( FTC_Manager manager,
- FT_ULong max_bytes,
- FTC_Image_Cache* acache );
-
- FT_EXPORT_DEF( void ) FTC_Image_Cache_Done( FTC_Image_Cache cache );
-
- FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_Lookup(
- FTC_Image_Cache cache,
- FTC_Image_Desc* desc,
- FT_UInt gindex,
- FT_Glyph* aglyph );
#ifdef __cplusplus
diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c
index d9af769..3a9a0d3 100644
--- a/src/cache/ftcmanag.c
+++ b/src/cache/ftcmanag.c
@@ -20,7 +20,7 @@
#include <freetype/internal/ftobjs.h>
-#define FTC_LRU_GET_MANAGER( lru ) ((FTC_Manager_Lru)lru)->manager
+#define FTC_LRU_GET_MANAGER( lru ) (FTC_Manager)lru->user_data
/**************************************************************************/
@@ -40,6 +40,7 @@
error = manager->request_face( (FTC_FaceID)node->key,
+ manager->library,
manager->request_data,
(FT_Face*)&node->root.data );
if ( !error )
@@ -179,7 +180,7 @@
static
const FT_Lru_Class ftc_face_lru_class =
{
- sizeof ( FTC_Manager_LruRec ),
+ sizeof ( FT_LruRec ),
ftc_manager_init_face,
ftc_manager_done_face,
0,
@@ -190,7 +191,7 @@
static
const FT_Lru_Class ftc_size_lru_class =
{
- sizeof ( FTC_Manager_LruRec ),
+ sizeof ( FT_LruRec ),
ftc_manager_init_size,
ftc_manager_done_size,
ftc_manager_flush_size,
@@ -213,6 +214,7 @@
error = FT_Lru_New( &ftc_face_lru_class,
FTC_MAX_FACES,
+ manager,
memory,
1, /* pre_alloc = TRUE */
(FT_Lru*)&manager->faces_lru );
@@ -221,15 +223,13 @@
error = FT_Lru_New( &ftc_size_lru_class,
FTC_MAX_SIZES,
+ manager,
memory,
1, /* pre_alloc = TRUE */
(FT_Lru*)&manager->sizes_lru );
if ( error )
goto Exit;
- ((FTC_Manager_Lru)manager->faces_lru)->manager = manager;
- ((FTC_Manager_Lru)manager->sizes_lru)->manager = manager;
-
manager->library = library;
manager->request_face = requester;
manager->request_data = req_data;
@@ -275,6 +275,7 @@
}
+
FT_EXPORT_DEF( FT_Error ) FTC_Manager_Lookup_Size( FTC_Manager manager,
FTC_SizeID size_id,
FT_Face* aface,
@@ -285,24 +286,34 @@
FT_Face face;
- *aface = 0;
- *asize = 0;
+ if (aface)
+ *aface = 0;
+
+ if (asize)
+ *asize = 0;
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;
error = FT_Lru_Lookup( manager->sizes_lru,
(FT_LruKey)&req,
- (FT_Pointer*)asize );
+ (FT_Pointer*)&size );
if ( !error )
{
/* select the size as the current one for this face */
face->size = *asize;
- *aface = face;
+
+ if (asize)
+ *asize = size;
+
+ if (aface)
+ *aface = face;
}
}
diff --git a/src/cache/ftcmanag.h b/src/cache/ftcmanag.h
index b765ed4..fa28eb6 100644
--- a/src/cache/ftcmanag.h
+++ b/src/cache/ftcmanag.h
@@ -19,6 +19,7 @@
#ifndef FTCMANAG_H
#define FTCMANAG_H
+#include <freetype/ftcache.h>
#include <cache/ftlru.h>
@@ -31,32 +32,6 @@
#define FTC_MAX_SIZES 8
- typedef FT_Pointer FTC_FaceID;
-
- typedef struct FTC_SizeRec_
- {
- FTC_FaceID face_id;
- FT_UShort pix_width;
- FT_UShort pix_height;
-
- } FTC_SizeRec, *FTC_SizeID;
-
-
- typedef FT_Error (*FTC_Face_Requester)( FTC_FaceID face_id,
- FT_Pointer data,
- FT_Face* aface );
-
-
- typedef struct FTC_ManagerRec_* FTC_Manager;
-
- typedef struct FTC_Manager_LruRec_
- {
- FT_LruRec root;
- FTC_Manager manager;
-
- } FTC_Manager_LruRec, *FTC_Manager_Lru;
-
-
typedef struct FTC_ManagerRec_
{
FT_Library library;
@@ -69,24 +44,6 @@
} FTC_ManagerRec;
- FT_EXPORT_DEF( FT_Error ) FTC_Manager_New( FT_Library library,
- FTC_Face_Requester requester,
- FT_Pointer req_data,
- FTC_Manager* amanager );
-
- FT_EXPORT_DEF( void ) FTC_Manager_Done( FTC_Manager manager );
-
- FT_EXPORT_DEF( void ) FTC_Manager_Reset( FTC_Manager manager );
-
- FT_EXPORT_DEF( FT_Error ) FTC_Manager_Lookup_Face( FTC_Manager manager,
- FTC_FaceID face_id,
- FT_Face* aface );
-
- FT_EXPORT_DEF( FT_Error ) FTC_Manager_Lookup_Size( FTC_Manager manager,
- FTC_SizeID size_id,
- FT_Face* aface,
- FT_Size* asize );
-
#ifdef __cplusplus
}
diff --git a/src/cache/ftlru.c b/src/cache/ftlru.c
index c830b96..e4e60a9 100644
--- a/src/cache/ftlru.c
+++ b/src/cache/ftlru.c
@@ -38,6 +38,7 @@
FT_EXPORT_FUNC( FT_Error ) FT_Lru_New( const FT_Lru_Class* clazz,
FT_UInt max_elements,
+ FT_Pointer user_data,
FT_Memory memory,
FT_Bool pre_alloc,
FT_Lru* alru )
@@ -66,6 +67,7 @@
lru->clazz = (FT_Lru_Class*)clazz;
lru->max_elements = max_elements;
lru->memory = memory;
+ lru->user_data = user_data;
*alru = lru;
}
diff --git a/src/cache/ftlru.h b/src/cache/ftlru.h
index 28054c8..300b72a 100644
--- a/src/cache/ftlru.h
+++ b/src/cache/ftlru.h
@@ -40,6 +40,8 @@
typedef struct FT_LruRec_* FT_Lru;
+
+
typedef struct FT_Lru_Class_
{
FT_UInt lru_size; /* object size in bytes */
@@ -60,6 +62,7 @@
} FT_Lru_Class;
+
typedef FT_Bool (*FT_Lru_Selector)( FT_Lru lru,
FT_LruNode node,
FT_Pointer data );
@@ -72,6 +75,7 @@
FT_UInt num_elements;
FT_ListRec elements;
FT_Memory memory;
+ FT_Pointer user_data;
/* the following fields are only meaningful for static lru containers */
FT_ListRec free_nodes;
@@ -82,6 +86,7 @@
FT_EXPORT_DEF( FT_Error ) FT_Lru_New( const FT_Lru_Class* clazz,
FT_UInt max_elements,
+ FT_Pointer user_data,
FT_Memory memory,
FT_Bool pre_alloc,
FT_Lru* alru );
diff --git a/src/cache/rules.mk b/src/cache/rules.mk
new file mode 100644
index 0000000..62b7cdd
--- /dev/null
+++ b/src/cache/rules.mk
@@ -0,0 +1,70 @@
+#
+# FreeType 2 Cache configuration rules
+#
+
+
+# Copyright 1996-2000 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT. By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
+# Cache driver directory
+#
+Cache_DIR := $(SRC_)cache
+Cache_DIR_ := $(Cache_DIR)$(SEP)
+
+
+# compilation flags for the driver
+#
+Cache_COMPILE := $(FT_COMPILE)
+
+
+# Cache driver sources (i.e., C files)
+#
+Cache_DRV_SRC := $(Cache_DIR_)ftlru.c \
+ $(Cache_DIR_)ftcmanag.c \
+ $(Cache_DIR_)ftcimage.c
+
+# Cache driver headers
+#
+Cache_DRV_H := $(Cache_DRV_SRC:%c=%h)
+
+
+# Cache driver object(s)
+#
+# Cache_DRV_OBJ_M is used during `multi' builds.
+# Cache_DRV_OBJ_S is used during `single' builds.
+#
+Cache_DRV_OBJ_M := $(Cache_DRV_SRC:$(Cache_DIR_)%.c=$(OBJ_)%.$O)
+Cache_DRV_OBJ_S := $(OBJ_)ftcache.$O
+
+# Cache driver source file for single build
+#
+Cache_DRV_SRC_S := $(Cache_DIR_)ftcache.c
+
+
+# Cache driver - single object
+#
+$(Cache_DRV_OBJ_S): $(Cache_DRV_SRC_S) $(Cache_DRV_SRC) \
+ $(FREETYPE_H) $(Cache_DRV_H)
+ $(Cache_COMPILE) $T$@ $(Cache_DRV_SRC_S)
+
+
+# Cache driver - multiple objects
+#
+$(OBJ_)%.$O: $(Cache_DIR_)%.c $(FREETYPE_H) $(Cache_DRV_H)
+ $(Cache_COMPILE) $T$@ $<
+
+
+# update main driver object lists
+#
+DRV_OBJS_S += $(Cache_DRV_OBJ_S)
+DRV_OBJS_M += $(Cache_DRV_OBJ_M)
+
+
+# EOF