Commit f993b6a0332e4783e110d97636fcd009add48287
2000-01-08T17:10:33
demos/config/x11/rules.mk: support for multiple X11R6 entries in $(PATH) added. ftxbbox.c, ftcalc.c, ftdebug.c, ftdriver.h: doc fixes. ftdebug.c: formatting. ftdebug.h: making makros `;'-safe (i.e., they can now be used within if-else clauses without side effects resp. don't produce a single `;').
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
diff --git a/demos/config/x11/rules.mk b/demos/config/x11/rules.mk
index 58feda1..f14ab65 100644
--- a/demos/config/x11/rules.mk
+++ b/demos/config/x11/rules.mk
@@ -41,13 +41,13 @@ endif
#
ifneq ($(X11_PATH),)
-X11_INCLUDE := $(X11_PATH)$(SEP)include
-X11_LIB := $(X11_PATH)$(SEP)lib
+X11_INCLUDE := $(X11_PATH:%=%$(SEP)include)
+X11_LIB := $(X11_PATH:%=%$(SEP)lib)
# the GRAPH_LINK variable is expanded each time an executable is linked against
# the graphics library..
#
-GRAPH_LINK += -L$(X11_LIB) -lX11
+GRAPH_LINK += $(X11_LIB:%=-L%) -lX11
# Solaris needs a -lsocket in GRAPH_LINK ..
#
diff --git a/src/base/ftbbox.c b/src/base/ftbbox.c
index 6687412..6cd35d8 100644
--- a/src/base/ftbbox.c
+++ b/src/base/ftbbox.c
@@ -47,11 +47,13 @@
/* <Description> */
/* This function is used as a `move_to' and `line_to' emitter during */
/* FT_Raster_Decompose(). It simply records the destination point in */
- /* user->last. */
+ /* `user->last'. */
/* */
/* <Input> */
- /* to :: The destination vector. */
- /* user :: The current walk context. */
+ /* to :: A pointer to the destination vector. */
+ /* */
+ /* <InOut> */
+ /* user :: A pointer to the current walk context. */
/* */
/* <Return> */
/* Error code. 0 means success. */
@@ -88,7 +90,7 @@
/* y2 :: The coordinate of the control point. */
/* y3 :: The end coordinate. */
/* */
- /* <Output> */
+ /* <InOut> */
/* min :: The address of the current minimum. */
/* max :: The address of the current maximum. */
/* */
@@ -143,11 +145,11 @@
/* update it. */
/* */
/* <Input> */
- /* control :: A control point. */
- /* to :: The destination vector. */
+ /* control :: A pointer to a control point. */
+ /* to :: A pointer to the destination vector. */
/* */
/* <InOut> */
- /* user :: The current walk context. */
+ /* user :: The address of the current walk context. */
/* */
/* <Return> */
/* Error code. 0 means success. */
@@ -288,12 +290,12 @@
/* update it. */
/* */
/* <Input> */
- /* control1 :: The first control point. */
- /* control2 :: The second control point. */
- /* to :: The destination vector. */
+ /* control1 :: A pointer to the first control point. */
+ /* control2 :: A pointer to the second control point. */
+ /* to :: A pointer to the destination vector. */
/* */
/* <InOut> */
- /* user :: The current walk context. */
+ /* user :: The address of the current walk context. */
/* */
/* <Return> */
/* Error code. 0 means success. */
@@ -350,7 +352,7 @@
/* outline :: A pointer to the source outline. */
/* */
/* <Output> */
- /* bbox :: The outline's exact bounding box. */
+ /* abbox :: A pointer to the outline's exact bounding box. */
/* */
/* <Return> */
/* Error code. 0 means success. */
@@ -376,8 +378,8 @@
return 0;
}
- /* We compute the control box, as well as the bounding box */
- /* of all `on' points in the outline. Then, if the two boxes */
+ /* We compute the control box as well as the bounding box of */
+ /* all `on' points in the outline. Then, if the two boxes */
/* coincide, we exit immediately. */
vec = outline->points;
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index 3ec8ed5..008c281 100644
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -422,15 +422,18 @@
/* FT_Add64 */
/* */
/* <Description> */
- /* Add two Int64 values. Will be wrapped by the ADD_64() macro. */
+ /* Add two Int64 values. */
/* */
/* <Input> */
/* x :: A pointer to the first value to be added. */
/* y :: A pointer to the second value to be added. */
/* */
- /* <InOut> */
+ /* <Output> */
/* z :: A pointer to the result of `x + y'. */
/* */
+ /* <Note> */
+ /* Will be wrapped by the ADD_64() macro. */
+ /* */
BASE_FUNC
void FT_Add64( FT_Int64* x,
FT_Int64* y,
@@ -452,16 +455,18 @@
/* FT_MulTo64 */
/* */
/* <Description> */
- /* Multiplies two Int32 integers. Returns a Int64 integer. Will be */
- /* wrapped by the MUL_64() macro. */
+ /* Multiplies two Int32 integers. Returns a Int64 integer. */
/* */
/* <Input> */
/* x :: The first multiplier. */
/* y :: The second multiplier. */
/* */
- /* <InOut> */
+ /* <Output> */
/* z :: A pointer to the result of `x * y'. */
/* */
+ /* <Note> */
+ /* Will be wrapped by the MUL_64() macro. */
+ /* */
BASE_FUNC
void FT_MulTo64( FT_Int32 x,
FT_Int32 y,
@@ -516,7 +521,7 @@
/* */
/* <Description> */
/* Divides an Int64 value by an Int32 value. Returns an Int32 */
- /* integer. Will be wrapped by the DIV_64() macro. */
+ /* integer. */
/* */
/* <Input> */
/* x :: A pointer to the dividend. */
@@ -525,6 +530,9 @@
/* <Return> */
/* The result of `x / y'. */
/* */
+ /* <Note> */
+ /* Will be wrapped by the DIV_64() macro. */
+ /* */
BASE_FUNC
FT_Int32 FT_Div64by32( FT_Int64* x,
FT_Int32 y )
diff --git a/src/base/ftcalc.h b/src/base/ftcalc.h
index 949d88f..020b218 100644
--- a/src/base/ftcalc.h
+++ b/src/base/ftcalc.h
@@ -50,9 +50,12 @@
#define MUL_64( x, y, z ) FT_MulTo64( x, y, &z )
#define DIV_64( x, y ) FT_Div64by32( &x, y )
- BASE_DEF void FT_Add64 ( FT_Int64* x, FT_Int64* y, FT_Int64* z );
- BASE_DEF void FT_MulTo64 ( FT_Int32 x, FT_Int32 y, FT_Int64* z );
- BASE_DEF FT_Int32 FT_Div64by32( FT_Int64* x, FT_Int32 y );
+ BASE_DEF
+ void FT_Add64 ( FT_Int64* x, FT_Int64* y, FT_Int64* z );
+ BASE_DEF
+ void FT_MulTo64 ( FT_Int32 x, FT_Int32 y, FT_Int64* z );
+ BASE_DEF
+ FT_Int32 FT_Div64by32( FT_Int64* x, FT_Int32 y );
#endif /* LONG64 */
@@ -60,7 +63,8 @@
#define SQRT_32( x ) FT_Sqrt32( x )
- BASE_DEF FT_Int32 FT_Sqrt32( FT_Int32 l );
+ BASE_DEF
+ FT_Int32 FT_Sqrt32( FT_Int32 l );
/*************************************************************************/
/* */
diff --git a/src/base/ftdebug.c b/src/base/ftdebug.c
index 168f9b7..06d2329 100644
--- a/src/base/ftdebug.c
+++ b/src/base/ftdebug.c
@@ -4,7 +4,7 @@
/* */
/* Debugging and logging component (body). */
/* */
-/* Copyright 1996-1999 by */
+/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used */
@@ -31,14 +31,6 @@
#include <string.h>
- /*************************************************************************/
- /* */
- /* The Print() function is defined in ftconfig.h. It defaults to */
- /* vprintf() on systems which have it. */
- /* */
- /*************************************************************************/
-
-
void FT_Message( const char* fmt, ... )
{
va_list ap;
@@ -65,6 +57,21 @@
#ifdef FT_DEBUG_LEVEL_TRACE
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_SetTraceLevel */
+ /* */
+ /* <Description> */
+ /* Sets the trace level for debugging. */
+ /* */
+ /* <Input> */
+ /* component :: The component which should be traced. See ftdebug.h */
+ /* for a complete list. If set to `trace_any', all */
+ /* components will be traced. */
+ /* level :: The tracing level. */
+ /* */
EXPORT_FUNC
void FT_SetTraceLevel( FT_Trace component,
char level )
diff --git a/src/base/ftdebug.h b/src/base/ftdebug.h
index c619f35..b521e3f 100644
--- a/src/base/ftdebug.h
+++ b/src/base/ftdebug.h
@@ -4,7 +4,7 @@
/* */
/* Debugging and logging component (specification). */
/* */
-/* Copyright 1996-1999 by */
+/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used */
@@ -35,7 +35,7 @@
/* */
/* - release mode: */
/* */
- /* No error message is sent nor generated. The code is free from any */
+ /* No error message is sent or generated. The code is free from any */
/* debugging parts. */
/* */
/*************************************************************************/
@@ -57,6 +57,7 @@
typedef enum FT_Trace_
{
+ /* the first level must always be `trace_any' */
trace_any = 0,
/* first, define an enum for each common component */
@@ -78,12 +79,14 @@
trace_ttextend,
trace_ttdriver,
+#if 0
/* define an enum for each TrueDoc driver component */
trace_tdobjs,
trace_tdload,
trace_tdgload,
trace_tdhint,
trace_tddriver,
+#endif
/* define an enum for each Type1 driver component */
trace_t1objs,
@@ -93,13 +96,14 @@
trace_t1driver,
/* other trace levels */
- trace_init,
+ trace_init,
/* the last level must always be `trace_max' */
trace_max
} FT_Trace;
+ /* declared in ftdebug.c */
extern char ft_trace_levels[trace_max];
@@ -113,9 +117,12 @@
/*************************************************************************/
-#define FT_TRACE( level, varformat ) \
- if ( ft_trace_levels[FT_COMPONENT] >= level ) \
- FT_Message##varformat
+#define FT_TRACE( level, varformat ) \
+ do \
+ { \
+ if ( ft_trace_levels[FT_COMPONENT] >= level ) \
+ FT_Message##varformat; \
+ } while ( 0 )
EXPORT_DEF
@@ -126,16 +133,16 @@
#elif defined( FT_DEBUG_LEVEL_ERROR )
-#define FT_TRACE( level, varformat ) /* nothing */
+#define FT_TRACE( level, varformat ) while ( 0 ) { } /* nothing */
#else /* release mode */
-#define FT_Assert( condition ) /* nothing */
+#define FT_Assert( condition ) while ( 0 ) { } /* nothing */
-#define FT_TRACE( level, varformat ) /* nothing */
-#define FT_ERROR( varformat ) /* nothing */
+#define FT_TRACE( level, varformat ) while ( 0 ) { } /* nothing */
+#define FT_ERROR( varformat ) while ( 0 ) { } /* nothing */
#endif /* FT_DEBUG_LEVEL_TRACE, FT_DEBUG_LEVEL_ERROR */
@@ -146,7 +153,7 @@
/* Define macros and functions that are common to the debug and trace */
/* modes. */
/* */
- /* You need vprintf() to be able to compile ttdebug.c. */
+ /* You need vprintf() to be able to compile ftdebug.c. */
/* */
/*************************************************************************/
@@ -155,10 +162,15 @@
#include "stdio.h" /* for vprintf() */
-#define FT_Assert( condition ) \
- if ( !(condition) ) \
- FT_Panic( "assertion failed on line %d of file %s\n", __LINE__, __FILE__ );
+#define FT_Assert( condition ) \
+ do \
+ { \
+ if ( !( condition ) ) \
+ FT_Panic( "assertion failed on line %d of file %s\n", \
+ __LINE__, __FILE__ ); \
+ } while ( 0 )
+ /* print a message */
extern void FT_Message( const char* fmt, ... );
/* print a message and exit */
@@ -170,6 +182,9 @@
#endif /* FT_DEBUG_LEVEL_TRACE || FT_DEBUG_LEVEL_ERROR */
+/* you need two opening resp. closing parentheses!
+ Example: FT_TRACE0(( "Value is %i", foo )) */
+
#define FT_TRACE0( varformat ) FT_TRACE( 0, varformat )
#define FT_TRACE1( varformat ) FT_TRACE( 1, varformat )
#define FT_TRACE2( varformat ) FT_TRACE( 2, varformat )
diff --git a/src/base/ftdriver.h b/src/base/ftdriver.h
index fe24f46..7db8d49 100644
--- a/src/base/ftdriver.h
+++ b/src/base/ftdriver.h
@@ -4,7 +4,7 @@
/* */
/* FreeType driver interface (specification). */
/* */
-/* Copyright 1996-1999 by */
+/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used */
@@ -56,7 +56,7 @@
/*************************************************************************/
/* */
/* <FuncType> */
- /* FTDriver_doneEngine */
+ /* FTDriver_doneDriver */
/* */
/* <Description> */
/* A driver method used to finalize a given driver object. Note that */
@@ -95,7 +95,7 @@
/* */
/* <Return> */
/* A typeless pointer to the extension's interface (normally a table */
- /* of function pointers). Returns NULL when the requested extension */
+ /* of function pointers). Returns NULL if the requested extension */
/* isn't available (i.e., wasn't compiled in the driver at build */
/* time). */
/* */
@@ -106,17 +106,18 @@
/*************************************************************************/
/* */
/* <Type> */
- /* FTDriver_formatInterface */
+ /* FT_FormatInterface */
/* */
/* <Description> */
/* A driver interface field whose value is a driver-specific */
- /* interface method tables. This table contains entry points to */
+ /* interface method table. This table contains entry points to */
/* various functions that are strictly related to the driver's */
/* format. */
/* */
typedef void* FT_FormatInterface;
+
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@@ -140,28 +141,27 @@
/* must be created by the caller. */
/* */
/* <Input> */
- /* driver :: A handle to the source driver object. */
- /* resource :: A handle to the source resource. */
- /* typeface_index :: The index of face in the font resource. Used to */
+ /* stream :: The input stream. */
+ /* typeface_index :: The face index in the font resource. Used to */
/* access individual faces in collections. */
- /* */
/* face :: A handle to the new target face. */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
/* <Note> */
- /* The `typeface_index' parameter field will be set to -1 when the */
+ /* The `typeface_index' parameter field will be set to -1 if the */
/* engine only wants to test the format of the resource. This means */
/* that font drivers should simply check the font format, then return */
/* immediately with an error code of 0 (meaning success). The field */
/* `num_faces' should be set. */
/* */
- /* done_face() will be called subsequently, whatever the result was. */
+ /* FTDriver_doneFace() will be called subsequently, whatever the */
+ /* result was. */
/* */
- typedef FT_Error (*FTDriver_initFace)( FT_Stream stream,
- FT_Long typeface_index,
- FT_Face face );
+ typedef FT_Error (*FTDriver_initFace)( FT_Stream stream,
+ FT_Long typeface_index,
+ FT_Face face );
/*************************************************************************/
@@ -194,15 +194,13 @@
/* */
/* <Input> */
/* face :: A handle to the source face object. */
- /* */
/* left_glyph :: The index of the left glyph in the kern pair. */
- /* */
/* right_glyph :: The index of the right glyph in the kern pair. */
/* */
/* <Output> */
- /* kerning :: The kerning vector. This is in font units for */
- /* scalable formats, and in pixels for fixed-sizes */
- /* formats. */
+ /* kerning :: A pointer to the kerning vector. This is in font */
+ /* units for scalable formats, and in pixels for */
+ /* fixed-sizes formats. */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */
@@ -213,7 +211,7 @@
/* kernings are out of the scope of this method (the basic driver */
/* interface is meant to be simple). */
/* */
- /* They can be implemented through format-specific interfaces. */
+ /* They can be implemented by format-specific interfaces. */
/* */
typedef FT_Error (*FTDriver_getKerning)( FT_Face face,
FT_UInt left_glyph,
@@ -221,6 +219,7 @@
FT_Vector* kerning );
+
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@@ -244,7 +243,6 @@
/* must be created by the caller. */
/* */
/* <Input> */
- /* face :: A handle to the parent face object. */
/* size :: A handle to the new size object. */
/* */
/* <Return> */
@@ -267,11 +265,13 @@
/* and vertical) expressed in fractional points. */
/* */
/* <Input> */
- /* size :: A handle to the target size object. */
- /* char_width :: The character width expressed in 26.6 fractional */
- /* points. */
- /* char_height :: The character height expressed in 26.6 fractional */
- /* points. */
+ /* size :: A handle to the target size object. */
+ /* char_width :: The character width expressed in 26.6 */
+ /* fractional points. */
+ /* char_height :: The character height expressed in 26.6 */
+ /* fractional points. */
+ /* horz_resolution :: The horizontal resolution. */
+ /* vert_resolution :: The vertical resolution. */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */
@@ -298,26 +298,17 @@
/* */
/* <Input> */
/* size :: A handle to the target size object. */
- /* */
/* pixel_width :: The character width expressed in 26.6 fractional */
/* pixels. */
- /* */
/* pixel_height :: The character height expressed in 26.6 fractional */
/* pixels. */
/* */
- /* point_size :: The corresponding character size in points. This */
- /* value is only sent to the TrueType bytecode */
- /* interpreter, even though 99% of glyph programs */
- /* will simply ignore it. A safe value there is the */
- /* maximum of the pixel width and height (multiplied */
- /* by 64 to make it a 26.6 fixed float). */
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
/* <Note> */
/* This function should work with all kinds of `Size' objects, either */
- /* fixed or scalable ones. The `point_size' parameter will simply be */
- /* ignored in case of fixed formats. */
+ /* fixed or scalable ones. */
/* */
typedef FT_Error (*FTDriver_setPixelSizes)( FT_Size size,
FT_UInt pixel_width,
@@ -337,12 +328,10 @@
/* <Input> */
/* size :: A handle to the target size object. */
/* */
- /* <Return> */
- /* FreeType error code. 0 means success. */
- /* */
typedef void (*FTDriver_doneSize)( FT_Size size );
+
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@@ -368,7 +357,6 @@
/* bitmap format. */
/* */
/* <Input> */
- /* face :: A handle to the parent face object. */
/* slot :: A handle to the new glyph slot object. */
/* */
/* <Return> */
@@ -387,12 +375,8 @@
/* is not destroyed by this function. */
/* */
/* <Input> */
- /* face :: A handle to the parent face object. */
/* slot :: A handle to the new glyph slot object. */
/* */
- /* <Return> */
- /* FreeType error code. 0 means success. */
- /* */
typedef void (*FTDriver_doneGlyphSlot)( FT_GlyphSlot slot );
@@ -407,21 +391,14 @@
/* <Input> */
/* slot :: A handle to target slot object where the glyph will */
/* be loaded. */
- /* */
/* size :: A handle to the source face size at which the glyph */
/* must be scaled/loaded. */
- /* */
/* glyph_index :: The index of the glyph in the font file. */
- /* */
/* load_flags :: A flag indicating what to load for this glyph. The */
/* FTLOAD_??? constants can be used to control the */
/* glyph loading process (e.g., whether the outline */
/* should be scaled, whether to load bitmaps or not, */
/* whether to hint the outline, etc). */
- /* <Output> */
- /* result :: A set of bit flags indicating the type of data that */
- /* was loaded in the glyph slot (outline, bitmap, */
- /* pixmap, etc). */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */
@@ -432,6 +409,7 @@
FT_Int load_flags );
+
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@@ -463,6 +441,19 @@
FT_Long charcode );
+
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+ /**** ****/
+ /**** ****/
+ /**** I N T E R F A C E ****/
+ /**** ****/
+ /**** ****/
+ /*************************************************************************/
+ /*************************************************************************/
+ /*************************************************************************/
+
/*************************************************************************/
/* */
/* <Struct> */
@@ -482,63 +473,52 @@
/* <Fields> */
/* driver_object_size :: The size in bytes of a single driver */
/* object. */
- /* */
/* face_object_size :: The size in bytes of a single face object. */
- /* */
/* size_object_size :: The size in bytes of a single size object. */
- /* */
/* slot_object_size :: The size in bytes of a single glyph slot */
/* object. */
/* */
- /* driver_name :: a string to describe the driver to the */
- /* system. It doesn't necessarily describe */
+ /* driver_name :: A string to describe the driver to the */
+ /* system. It doesn't necessarily describe */
/* in detail all the font formats the driver */
/* may support. */
- /* */
- /* driver_version :: driver version number. starts at 1 */
- /* */
- /* driver_requires :: the FreeType major version this driver is */
- /* written for. This number should be equal */
- /* to or greater than 2 ! */
+ /* driver_version :: The driver version number. Starts at 1. */
+ /* driver_requires :: The FreeType major version this driver is */
+ /* written for. This number should be equal */
+ /* to or greater than 2! */
/* */
/* format_interface :: A pointer to the driver's format-specific */
/* interface. */
/* */
/* init_driver :: Used to initialize a given driver object. */
- /* */
/* done_driver :: Used to finalize and destroy a given */
/* driver object. */
- /* */
- /* get_extension :: Returns an interface for a given driver */
+ /* get_interface :: Returns an interface for a given driver */
/* extension. */
/* */
/* init_face :: Initializes a given face object. */
- /* */
/* done_face :: Discards a face object, as well as all */
/* child objects (sizes, charmaps, glyph */
/* slots). */
- /* */
/* get_kerning :: Returns the kerning vector corresponding */
/* to a pair of glyphs, expressed in unscaled */
/* font units. */
/* */
/* init_size :: Initializes a given size object. */
- /* */
/* done_size :: Finalizes a given size object. */
- /* */
/* set_size_char_sizes :: Resets a scalable size object's character */
/* size. */
- /* */
/* set_pixel_sizes :: Resets a face size object's pixel */
/* dimensions. Applies to both scalable and */
/* fixed faces. */
/* */
/* init_glyph_slot :: Initializes a given glyph slot object. */
- /* */
/* done_glyph_slot :: Finalizes a given glyph slot. */
- /* */
/* load_glyph :: Loads a given glyph into a given slot. */
/* */
+ /* get_char_index :: Returns the glyph index for a given */
+ /* charmap. */
+ /* */
typedef struct FT_DriverInterface_
{
FT_Int driver_object_size;
@@ -573,6 +553,7 @@
} FT_DriverInterface;
+
#endif /* FTDRIVER_H */