Commit 3dc4374f433c7da0520ac4cbf5a4e6da7eae1f14
2000-10-31T17:49:07
Formatting. Removed double src/cache/ftcimage.h. Replaced FTC_Image_Type with #defines since this contains bit flags and not enumerated values.
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
diff --git a/include/freetype/cache/ftcchunk.h b/include/freetype/cache/ftcchunk.h
index c2ee555..0a493cb 100644
--- a/include/freetype/cache/ftcchunk.h
+++ b/include/freetype/cache/ftcchunk.h
@@ -54,7 +54,7 @@
extern "C" {
#endif
-/* maximum number of chunk sets in a given chunk cache */
+ /* maximum number of chunk sets in a given chunk cache */
#define FTC_MAX_CHUNK_SETS 16
@@ -62,32 +62,32 @@
typedef struct FTC_ChunkSetRec_* FTC_ChunkSet;
typedef struct FTC_Chunk_CacheRec_* FTC_Chunk_Cache;
- typedef struct FTC_ChunkNodeRec_
+ typedef struct FTC_ChunkNodeRec_
{
- FTC_CacheNodeRec root;
- FTC_ChunkSet cset;
- FT_UShort cset_index;
- FT_UShort num_elements;
- FT_Byte* elements;
+ FTC_CacheNodeRec root;
+ FTC_ChunkSet cset;
+ FT_UShort cset_index;
+ FT_UShort num_elements;
+ FT_Byte* elements;
} FTC_ChunkNodeRec;
-#define FTC_CHUNKNODE_TO_LRUNODE(x) ((FT_ListNode)(x))
-#define FTC_LRUNODE_TO_CHUNKNODE(x) ((FTC_ChunkNode)(x))
+
+#define FTC_CHUNKNODE_TO_LRUNODE( x ) ((FT_ListNode)( x ))
+#define FTC_LRUNODE_TO_CHUNKNODE( x ) ((FTC_ChunkNode)( x ))
+
/*************************************************************************/
/* */
/* chunk set methods */
/* */
- /* used to set "element_max", "element_count" and "element_size" */
- typedef FT_Error (*FTC_ChunkSet_SizesFunc) ( FTC_ChunkSet cset,
- FT_Pointer type );
-
-
- typedef FT_Error (*FTC_ChunkSet_InitFunc) ( FTC_ChunkSet cset,
- FT_Pointer type );
+ /* used to set "element_max", "element_count" and "element_size" */
+ typedef FT_Error (*FTC_ChunkSet_SizesFunc) ( FTC_ChunkSet cset,
+ FT_Pointer type );
+ typedef FT_Error (*FTC_ChunkSet_InitFunc) ( FTC_ChunkSet cset,
+ FT_Pointer type );
typedef void (*FTC_ChunkSet_DoneFunc) ( FTC_ChunkSet cset );
@@ -95,14 +95,13 @@
FT_Pointer type );
+ typedef FT_Error (*FTC_ChunkSet_NewNodeFunc) ( FTC_ChunkSet cset,
+ FT_UInt index,
+ FTC_ChunkNode* anode );
- typedef FT_Error (*FTC_ChunkSet_NewNodeFunc)( FTC_ChunkSet cset,
- FT_UInt index,
- FTC_ChunkNode* anode );
-
- typedef void (*FTC_ChunkSet_DestroyNodeFunc)( FTC_ChunkNode node );
+ typedef void (*FTC_ChunkSet_DestroyNodeFunc)( FTC_ChunkNode node );
- typedef FT_ULong (*FTC_ChunkSet_SizeNodeFunc) ( FTC_ChunkNode node );
+ typedef FT_ULong (*FTC_ChunkSet_SizeNodeFunc) ( FTC_ChunkNode node );
typedef struct FTC_ChunkSet_Class_
@@ -151,24 +150,24 @@
/* the abstract chunk cache object */
typedef struct FTC_Chunk_CacheRec_
{
- FTC_CacheRec root;
- FT_Lru csets_lru; /* static chunk set lru list */
- FTC_ChunkSet last_cset; /* small cache :-) */
+ FTC_CacheRec root;
+ FT_Lru csets_lru; /* static chunk set lru list */
+ FTC_ChunkSet last_cset; /* small cache :-) */
} FTC_Chunk_CacheRec;
+
/*************************************************************************/
/* */
/* These functions are exported so that they can be called from */
- /* user-provided cache classes; otherwise, they are really parts of the */
+ /* user-provided cache classes; otherwise, they are really part of the */
/* cache sub-system internals. */
/* */
- FT_EXPORT_FUNC( FT_Error )
- FTC_ChunkNode_Init( FTC_ChunkNode node,
- FTC_ChunkSet cset,
- FT_UInt index,
- FT_Bool alloc );
+ FT_EXPORT_FUNC( FT_Error ) FTC_ChunkNode_Init( FTC_ChunkNode node,
+ FTC_ChunkSet cset,
+ FT_UInt index,
+ FT_Bool alloc );
#define FTC_ChunkNode_Ref( n ) \
FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count++
@@ -177,32 +176,23 @@
FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count--
- FT_EXPORT_DEF( void )
- FTC_ChunkNode_Destroy( FTC_ChunkNode node );
-
-
-
- FT_EXPORT_DEF( FT_Error )
- FTC_Chunk_Cache_Init( FTC_Chunk_Cache cache );
+ FT_EXPORT_DEF( void ) FTC_ChunkNode_Destroy( FTC_ChunkNode node );
+ FT_EXPORT_DEF( FT_Error ) FTC_Chunk_Cache_Init( FTC_Chunk_Cache cache );
- FT_EXPORT_DEF( void )
- FTC_Chunk_Cache_Done( FTC_Chunk_Cache cache );
+ FT_EXPORT_DEF( void ) FTC_Chunk_Cache_Done( FTC_Chunk_Cache cache );
+ FT_EXPORT_DEF( FT_Error ) FTC_ChunkSet_New( FTC_Chunk_Cache cache,
+ FT_Pointer type,
+ FTC_ChunkSet* aset );
+ FT_EXPORT_DEF( FT_Error ) FTC_ChunkSet_Lookup_Node(
+ FTC_ChunkSet cset,
+ FT_UInt glyph_index,
+ FTC_ChunkNode* anode,
+ FT_UInt* aindex );
- FT_EXPORT_DEF( FT_Error )
- FTC_ChunkSet_New( FTC_Chunk_Cache cache,
- FT_Pointer type,
- FTC_ChunkSet *aset );
-
-
- FT_EXPORT_DEF( FT_Error )
- FTC_ChunkSet_Lookup_Node( FTC_ChunkSet cset,
- FT_UInt glyph_index,
- FTC_ChunkNode *anode,
- FT_UInt *aindex );
#ifdef __cplusplus
}
@@ -211,4 +201,5 @@
#endif /* FTCCHUNK_H */
+
/* END */
diff --git a/include/freetype/cache/ftcglyph.h b/include/freetype/cache/ftcglyph.h
index ca70492..8a0acbd 100644
--- a/include/freetype/cache/ftcglyph.h
+++ b/include/freetype/cache/ftcglyph.h
@@ -24,13 +24,13 @@
/* For example, see `ftcimage.h' and `ftcimage.c' which */
/* implement a FT_Glyph cache based on this code. */
/* */
- /* NOTE: for now, each glyph set is implemented as a static hash table */
- /* it's be interesting to experiment with dynamic hashes to see */
- /* if this improves performance or not (I don't know why but */
- /* something tells me it won't ?!) */
+ /* NOTE: For now, each glyph set is implemented as a static hash table. */
+ /* It would be interesting to experiment with dynamic hashes to */
+ /* see whether this improves performance or not (I don't know why */
+ /* but something tells me it won't). */
/* */
- /* in all cases, this change should not affect any derived */
- /* glyph cache class.. */
+ /* In all cases, this change should not affect any derived glyph */
+ /* cache class. */
/* */
/*************************************************************************/
@@ -69,11 +69,12 @@
#define FTC_MAX_GLYPH_SETS 16
#define FTC_GSET_HASH_SIZE_DEFAULT 64
+
typedef struct FTC_GlyphSetRec_* FTC_GlyphSet;
typedef struct FTC_GlyphNodeRec_* FTC_GlyphNode;
typedef struct FTC_Glyph_CacheRec_* FTC_Glyph_Cache;
- typedef struct FTC_GlyphNodeRec_
+ typedef struct FTC_GlyphNodeRec_
{
FTC_CacheNodeRec root;
FTC_GlyphNode gset_next; /* next in glyph set's bucket list */
@@ -83,9 +84,9 @@
} FTC_GlyphNodeRec;
-#define FTC_GLYPHNODE(x) ( (FTC_GlyphNode)(x) )
-#define FTC_GLYPHNODE_TO_LRUNODE( n ) ( (FT_ListNode)(n) )
-#define FTC_LRUNODE_TO_GLYPHNODE( n ) ( (FTC_GlyphNode)(n) )
+#define FTC_GLYPHNODE( x ) ( (FTC_GlyphNode)( x ) )
+#define FTC_GLYPHNODE_TO_LRUNODE( n ) ( (FT_ListNode)( n ) )
+#define FTC_LRUNODE_TO_GLYPHNODE( n ) ( (FTC_GlyphNode)( n ) )
/*************************************************************************/
@@ -93,24 +94,24 @@
/* Glyph set methods. */
/* */
- typedef FT_Error (*FTC_GlyphSet_InitFunc) ( FTC_GlyphSet gset,
- FT_Pointer type );
+ typedef FT_Error (*FTC_GlyphSet_InitFunc) ( FTC_GlyphSet gset,
+ FT_Pointer type );
- typedef void (*FTC_GlyphSet_DoneFunc) ( FTC_GlyphSet gset );
+ typedef void (*FTC_GlyphSet_DoneFunc) ( FTC_GlyphSet gset );
- typedef FT_Bool (*FTC_GlyphSet_CompareFunc)( FTC_GlyphSet gset,
- FT_Pointer type );
+ typedef FT_Bool (*FTC_GlyphSet_CompareFunc) ( FTC_GlyphSet gset,
+ FT_Pointer type );
- typedef FT_Error (*FTC_GlyphSet_NewNodeFunc)( FTC_GlyphSet gset,
- FT_UInt gindex,
- FTC_GlyphNode *anode );
+ typedef FT_Error (*FTC_GlyphSet_NewNodeFunc) ( FTC_GlyphSet gset,
+ FT_UInt gindex,
+ FTC_GlyphNode* anode );
- typedef void (*FTC_GlyphSet_DestroyNodeFunc)( FTC_GlyphNode node,
- FTC_GlyphSet gset );
+ typedef void (*FTC_GlyphSet_DestroyNodeFunc)( FTC_GlyphNode node,
+ FTC_GlyphSet gset );
- typedef FT_ULong (*FTC_GlyphSet_SizeNodeFunc)( FTC_GlyphNode node,
- FTC_GlyphSet gset );
+ typedef FT_ULong (*FTC_GlyphSet_SizeNodeFunc) ( FTC_GlyphNode node,
+ FTC_GlyphSet gset );
typedef struct FTC_GlyphSet_Class_
@@ -154,8 +155,8 @@
typedef struct FTC_Glyph_CacheRec_
{
FTC_CacheRec root;
- FT_Lru gsets_lru; /* static sets lru list */
- FTC_GlyphSet last_gset; /* small cache :o) */
+ FT_Lru gsets_lru; /* static sets lru list */
+ FTC_GlyphSet last_gset; /* small cache :-) */
} FTC_Glyph_CacheRec;
@@ -163,14 +164,13 @@
/*************************************************************************/
/* */
/* These functions are exported so that they can be called from */
- /* user-provided cache classes; otherwise, they are really parts of the */
+ /* user-provided cache classes; otherwise, they are really part of the */
/* cache sub-system internals. */
/* */
- FT_EXPORT_FUNC( void )
- FTC_GlyphNode_Init( FTC_GlyphNode node,
- FTC_GlyphSet gset,
- FT_UInt gindex );
+ FT_EXPORT_FUNC( void ) FTC_GlyphNode_Init( FTC_GlyphNode node,
+ FTC_GlyphSet gset,
+ FT_UInt gindex );
#define FTC_GlyphNode_Ref( n ) \
FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count++
@@ -179,32 +179,22 @@
FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count--
- FT_EXPORT_DEF( void )
- FTC_GlyphNode_Destroy( FTC_GlyphNode node,
- FTC_Glyph_Cache cache );
-
-
-
- FT_EXPORT_DEF( FT_Error )
- FTC_Glyph_Cache_Init( FTC_Glyph_Cache cache );
+ FT_EXPORT_DEF( void ) FTC_GlyphNode_Destroy( FTC_GlyphNode node,
+ FTC_Glyph_Cache cache );
+ FT_EXPORT_DEF( FT_Error ) FTC_Glyph_Cache_Init( FTC_Glyph_Cache cache );
- FT_EXPORT_DEF( void )
- FTC_Glyph_Cache_Done( FTC_Glyph_Cache cache );
+ FT_EXPORT_DEF( void ) FTC_Glyph_Cache_Done( FTC_Glyph_Cache cache );
+ FT_EXPORT_DEF( FT_Error ) FTC_GlyphSet_New( FTC_Glyph_Cache cache,
+ FT_Pointer type,
+ FTC_GlyphSet* aset );
-
- FT_EXPORT_DEF( FT_Error )
- FTC_GlyphSet_New( FTC_Glyph_Cache cache,
- FT_Pointer type,
- FTC_GlyphSet *aset );
-
-
- FT_EXPORT_DEF( FT_Error )
- FTC_GlyphSet_Lookup_Node( FTC_GlyphSet gset,
- FT_UInt glyph_index,
- FTC_GlyphNode *anode );
+ FT_EXPORT_DEF( FT_Error ) FTC_GlyphSet_Lookup_Node(
+ FTC_GlyphSet gset,
+ FT_UInt glyph_index,
+ FTC_GlyphNode* anode );
#ifdef __cplusplus
@@ -214,4 +204,5 @@
#endif /* FTCGLYPH_H */
+
/* END */
diff --git a/include/freetype/cache/ftcimage.h b/include/freetype/cache/ftcimage.h
index f493339..24febe7 100644
--- a/include/freetype/cache/ftcimage.h
+++ b/include/freetype/cache/ftcimage.h
@@ -4,9 +4,6 @@
/* */
/* FreeType Image cache (body). */
/* */
-/* Each image cache really manages FT_Glyph objects :-) */
-/* */
-/* */
/* Copyright 2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
@@ -19,6 +16,13 @@
/***************************************************************************/
+ /*************************************************************************/
+ /* */
+ /* Each image cache really manages FT_Glyph objects. */
+ /* */
+ /*************************************************************************/
+
+
#ifndef FTCIMAGE_H
#define FTCIMAGE_H
@@ -44,44 +48,23 @@
#define FTC_IMAGE_FORMAT( x ) ( (x) & 7 )
- /*************************************************************************/
- /* */
- /* <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_format_bitmap = 0,
- ftc_image_format_outline = 1,
- ftc_image_flag_monochrome = 16,
- ftc_image_flag_unhinted = 32,
- ftc_image_flag_autohinted = 64,
- ftc_image_flag_unscaled = 128,
- ftc_image_flag_no_sbits = 256,
+#define ftc_image_format_bitmap 0
+#define ftc_image_format_outline 1
- ftc_image_mono = ftc_image_format_bitmap |
- ftc_image_flag_monochrome, /* monochrome bitmap */
- ftc_image_grays = ftc_image_format_bitmap, /* anti-aliased bitmap */
- ftc_image_outline = ftc_image_format_outline /* scaled outline */
+#define ftc_image_flag_monochrome 16
+#define ftc_image_flag_unhinted 32
+#define ftc_image_flag_autohinted 64
+#define ftc_image_flag_unscaled 128
+#define ftc_image_flag_no_sbits 256
- } FTC_Image_Type;
+ /* monochrome bitmap */
+#define ftc_image_mono ftc_image_format_bitmap | \
+ ftc_image_flag_monochrome
+ /* anti-aliased bitmap */
+#define ftc_image_grays ftc_image_format_bitmap
+ /* scaled outline */
+#define ftc_image_outline ftc_image_format_outline
/*************************************************************************/
@@ -128,10 +111,10 @@
/* Creates a new glyph image cache. */
/* */
/* <Input> */
- /* manager :: The parent manager for the image cache. */
+ /* manager :: The parent manager for the image cache. */
/* */
/* <Output> */
- /* acache :: A handle to the new glyph image cache object. */
+ /* acache :: A handle to the new glyph image cache object. */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */
@@ -160,10 +143,10 @@
/* failure. */
/* */
/* <Return> */
- /* error code, 0 means success */
+ /* FreeType error code. 0 means success. */
/* */
/* <Note> */
- /* the returned glyph is owned and manager by the glyph image cache. */
+ /* The returned glyph is owned and managed 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. */
/* */
@@ -171,12 +154,10 @@
/* 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 );
-
+ 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/include/freetype/ftcache.h b/include/freetype/ftcache.h
index 565598b..5387409 100644
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -91,9 +91,9 @@
/* FreeType error code. 0 means success. */
/* */
/* <Note> */
- /* the face requester should not perform funny things on the returned */
+ /* The face requester should not perform funny things on the returned */
/* face object, like creating a new FT_Size for it, or setting a */
- /* transform through FT_Set_Transform !! */
+ /* transformation through FT_Set_Transform()! */
/* */
typedef FT_Error (*FTC_Face_Requester)( FTC_FaceID face_id,
FT_Library library,
diff --git a/src/cache/ftcimage.h b/src/cache/ftcimage.h
deleted file mode 100644
index f493339..0000000
--- a/src/cache/ftcimage.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/***************************************************************************/
-/* */
-/* ftcimage.c */
-/* */
-/* FreeType Image cache (body). */
-/* */
-/* Each image cache really manages FT_Glyph objects :-) */
-/* */
-/* */
-/* Copyright 2000 by */
-/* David Turner, Robert Wilhelm, and Werner Lemberg. */
-/* */
-/* This file is part of the FreeType project, and may only be used, */
-/* modified, and distributed under the terms of the FreeType project */
-/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/***************************************************************************/
-
-
-#ifndef FTCIMAGE_H
-#define FTCIMAGE_H
-
-
-#include <freetype/cache/ftcglyph.h>
-#include <freetype/ftglyph.h>
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-
- /*************************************************************************/
- /*************************************************************************/
- /*************************************************************************/
- /***** *****/
- /***** IMAGE CACHE OBJECT *****/
- /***** *****/
- /*************************************************************************/
- /*************************************************************************/
- /*************************************************************************/
-
-
-#define FTC_IMAGE_FORMAT( x ) ( (x) & 7 )
-
- /*************************************************************************/
- /* */
- /* <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_format_bitmap = 0,
- ftc_image_format_outline = 1,
-
- ftc_image_flag_monochrome = 16,
- ftc_image_flag_unhinted = 32,
- ftc_image_flag_autohinted = 64,
- ftc_image_flag_unscaled = 128,
- ftc_image_flag_no_sbits = 256,
-
- ftc_image_mono = ftc_image_format_bitmap |
- ftc_image_flag_monochrome, /* monochrome bitmap */
- ftc_image_grays = ftc_image_format_bitmap, /* anti-aliased bitmap */
- ftc_image_outline = ftc_image_format_outline /* scaled outline */
-
- } FTC_Image_Type;
-
-
- /*************************************************************************/
- /* */
- /* <Struct> */
- /* FTC_Image_Desc */
- /* */
- /* <Description> */
- /* A simple structure used to describe a given glyph image category. */
- /* */
- /* <Fields> */
- /* size :: An FTC_SizeRec used to describe the glyph's face & */
- /* size. */
- /* */
- /* image_type :: The glyph image's type. */
- /* */
- typedef struct FTC_Image_Desc_
- {
- FTC_FontRec font;
- 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> */
- /* Creates a new glyph image cache. */
- /* */
- /* <Input> */
- /* manager :: The parent manager for the image cache. */
- /* */
- /* <Output> */
- /* acache :: A handle to the new glyph image cache object. */
- /* */
- /* <Return> */
- /* FreeType error code. 0 means success. */
- /* */
- FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_New( FTC_Manager manager,
- FTC_Image_Cache* acache );
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* FTC_Image_Cache_Lookup */
- /* */
- /* <Description> */
- /* Retrieves a given glyph image from a glyph image cache. */
- /* */
- /* <Input> */
- /* cache :: A handle to the source glyph image cache. */
- /* */
- /* desc :: A pointer to a glyph image descriptor. */
- /* */
- /* gindex :: The glyph index to retrieve. */
- /* */
- /* <Output> */
- /* aglyph :: The corresponding FT_Glyph object. 0 in case of */
- /* failure. */
- /* */
- /* <Return> */
- /* error code, 0 means success */
- /* */
- /* <Note> */
- /* the returned glyph is owned and manager by the glyph image cache. */
- /* Never try to transform or discard it manually! You can however */
- /* create a copy with FT_Glyph_Copy() and modify the new one. */
- /* */
- /* Because the glyph image cache limits the total amount of memory */
- /* taken by the glyphs it holds, the returned glyph might disappear */
- /* on a later invocation of this function! It's a cache after all... */
- /* */
- FT_EXPORT_DEF( FT_Error )
- FTC_Image_Cache_Lookup( FTC_Image_Cache cache,
- FTC_Image_Desc* desc,
- FT_UInt gindex,
- FT_Glyph* aglyph );
-
-
-
-#ifdef __cplusplus
- }
-#endif
-
-
-#endif /* FTCIMAGE_H */
-
-
-/* END */
diff --git a/src/cache/rules.mk b/src/cache/rules.mk
index 000dc95..086b099 100644
--- a/src/cache/rules.mk
+++ b/src/cache/rules.mk
@@ -40,7 +40,7 @@ Cache_DRV_SRC := $(CACHE_DIR_)ftlru.c \
Cache_DRV_H := $(CACHE_H_DIR_)ftlru.h \
$(CACHE_H_DIR_)ftcmanag.h \
$(CACHE_H_DIR_)ftcglyph.h \
- $(CACHE_DIR_)ftcimage.h
+ $(CACHE_H_DIR_)ftcimage.h
# Cache driver object(s)