Commit ef3c12650edd2dfa462f661596f3f62843846c1c
2002-03-14T09:22:48
* include/freetype/internal/ftdriver.h, include/freetype/internal/ftobjs.h, src/base/ftapi.c, src/base/ftobjs.c, src/cff/cffdrivr.c, src/cff/cffdrivr.h, src/cid/cidriver.c, src/cid/cidriver.h, src/pcf/pcfdriver.c, src/pcf/pcfdriver.h, src/truetype/ttdriver.c, src/truetype/ttdriver.h, src/type1/t1driver.c, src/type1/t1driver.h, src/winfonts/winfnt.c, src/winfonts/winfnt.h: updating the type definitions for font font drivers
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
diff --git a/ChangeLog b/ChangeLog
index ccce223..8f6b038 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,9 +13,20 @@
(i.e. CFF_Font => CFF_FontRec
CFF_Font* => CFF_Font, etc...)
- * include/freetype/internal/fnttypes.h, src/winfnt/*.c: updating
+ * include/freetype/internal/fnttypes.h, src/winfonts/*.c: updating
the type definitions of the Windows FNT font driver
+ * include/freetype/internal/ftdriver.h,
+ include/freetype/internal/ftobjs.h,
+ src/base/ftapi.c, src/base/ftobjs.c,
+ src/cff/cffdrivr.c, src/cff/cffdrivr.h,
+ src/cid/cidriver.c, src/cid/cidriver.h,
+ src/pcf/pcfdriver.c, src/pcf/pcfdriver.h,
+ src/truetype/ttdriver.c, src/truetype/ttdriver.h,
+ src/type1/t1driver.c, src/type1/t1driver.h,
+ src/winfonts/winfnt.c, src/winfonts/winfnt.h:
+ updating the type definitions for font font drivers
+
2002-03-13 Antoine Leca <antoine@oriolnet.com>
* include/freetype/config/ftoption.h: changed the automatic detection
diff --git a/include/freetype/internal/ftdriver.h b/include/freetype/internal/ftdriver.h
index d8c73d1..f7a2680 100644
--- a/include/freetype/internal/ftdriver.h
+++ b/include/freetype/internal/ftdriver.h
@@ -28,81 +28,81 @@ FT_BEGIN_HEADER
typedef FT_Error
- (*FTDriver_initFace)( FT_Stream stream,
- FT_Face face,
- FT_Int typeface_index,
- FT_Int num_params,
- FT_Parameter* parameters );
+ (*FT_Face_InitFunc)( FT_Stream stream,
+ FT_Face face,
+ FT_Int typeface_index,
+ FT_Int num_params,
+ FT_Parameter* parameters );
typedef void
- (*FTDriver_doneFace)( FT_Face face );
+ (*FT_Face_DoneFunc)( FT_Face face );
typedef FT_Error
- (*FTDriver_initSize)( FT_Size size );
+ (*FT_Size_InitFunc)( FT_Size size );
typedef void
- (*FTDriver_doneSize)( FT_Size size );
+ (*FT_Size_DoneFunc)( FT_Size size );
typedef FT_Error
- (*FTDriver_initGlyphSlot)( FT_GlyphSlot slot );
+ (*FT_Slot_InitFunc)( FT_GlyphSlot slot );
typedef void
- (*FTDriver_doneGlyphSlot)( FT_GlyphSlot slot );
+ (*FT_Slot_DoneFunc)( FT_GlyphSlot slot );
typedef FT_Error
- (*FTDriver_setCharSizes)( FT_Size size,
- FT_F26Dot6 char_width,
- FT_F26Dot6 char_height,
- FT_UInt horz_resolution,
- FT_UInt vert_resolution );
+ (*FT_Size_ResetPointsFunc)( FT_Size size,
+ FT_F26Dot6 char_width,
+ FT_F26Dot6 char_height,
+ FT_UInt horz_resolution,
+ FT_UInt vert_resolution );
typedef FT_Error
- (*FTDriver_setPixelSizes)( FT_Size size,
- FT_UInt pixel_width,
- FT_UInt pixel_height );
+ (*FT_Size_ResetPixelsFunc)( FT_Size size,
+ FT_UInt pixel_width,
+ FT_UInt pixel_height );
typedef FT_Error
- (*FTDriver_loadGlyph)( FT_GlyphSlot slot,
- FT_Size size,
- FT_UInt glyph_index,
- FT_Int load_flags );
+ (*FT_Slot_LoadFunc)( FT_GlyphSlot slot,
+ FT_Size size,
+ FT_UInt glyph_index,
+ FT_Int load_flags );
typedef FT_UInt
- (*FTDriver_getCharIndex)( FT_CharMap charmap,
- FT_Long charcode );
+ (*FT_CharMap_CharIndexFunc)( FT_CharMap charmap,
+ FT_Long charcode );
typedef FT_Long
- (*FTDriver_getNextChar)( FT_CharMap charmap,
- FT_Long charcode );
+ (*FT_CharMap_CharNextFunc)( FT_CharMap charmap,
+ FT_Long charcode );
typedef FT_Error
- (*FTDriver_getKerning)( FT_Face face,
- FT_UInt left_glyph,
- FT_UInt right_glyph,
- FT_Vector* kerning );
+ (*FT_Face_GetKerningFunc)( FT_Face face,
+ FT_UInt left_glyph,
+ FT_UInt right_glyph,
+ FT_Vector* kerning );
typedef FT_Error
- (*FTDriver_attachFile)( FT_Face face,
- FT_Stream stream );
+ (*FT_Face_AttachFunc)( FT_Face face,
+ FT_Stream stream );
typedef FT_Error
- (*FTDriver_getAdvances)( FT_Face face,
- FT_UInt first,
- FT_UInt count,
- FT_Bool vertical,
- FT_UShort* advances );
+ (*FT_Face_GetAdvancesFunc)( FT_Face face,
+ FT_UInt first,
+ FT_UInt count,
+ FT_Bool vertical,
+ FT_UShort* advances );
/*************************************************************************/
/* */
/* <Struct> */
- /* FT_Driver_Class */
+ /* FT_Driver_ClassRec */
/* */
/* <Description> */
/* The font driver class. This structure mostly contains pointers to */
@@ -165,36 +165,35 @@ FT_BEGIN_HEADER
/* Most function pointers, with the exception of `load_glyph' and */
/* `get_char_index' can be set to 0 to indicate a default behaviour. */
/* */
- typedef struct FT_Driver_Class_
+ typedef struct FT_Driver_ClassRec_
{
- FT_Module_Class root;
+ FT_Module_Class root;
- FT_Int face_object_size;
- FT_Int size_object_size;
- FT_Int slot_object_size;
+ FT_Int face_object_size;
+ FT_Int size_object_size;
+ FT_Int slot_object_size;
- FTDriver_initFace init_face;
- FTDriver_doneFace done_face;
+ FT_Face_InitFunc init_face;
+ FT_Face_DoneFunc done_face;
- FTDriver_initSize init_size;
- FTDriver_doneSize done_size;
+ FT_Size_InitFunc init_size;
+ FT_Size_DoneFunc done_size;
- FTDriver_initGlyphSlot init_slot;
- FTDriver_doneGlyphSlot done_slot;
+ FT_Slot_InitFunc init_slot;
+ FT_Slot_DoneFunc done_slot;
- FTDriver_setCharSizes set_char_sizes;
- FTDriver_setPixelSizes set_pixel_sizes;
+ FT_Size_ResetPointsFunc set_char_sizes;
+ FT_Size_ResetPixelsFunc set_pixel_sizes;
- FTDriver_loadGlyph load_glyph;
- FTDriver_getCharIndex get_char_index;
+ FT_Slot_LoadFunc load_glyph;
+ FT_CharMap_CharIndexFunc get_char_index;
- FTDriver_getKerning get_kerning;
- FTDriver_attachFile attach_file;
+ FT_Face_GetKerningFunc get_kerning;
+ FT_Face_AttachFunc attach_file;
+ FT_Face_GetAdvancesFunc get_advances;
+ FT_CharMap_CharNextFunc get_next_char;
- FTDriver_getAdvances get_advances;
-
- FTDriver_getNextChar get_next_char;
- } FT_Driver_Class;
+ } FT_Driver_ClassRec, *FT_Driver_Class;
FT_END_HEADER
diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index a292ab8..9e9de88 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -580,7 +580,7 @@ FT_BEGIN_HEADER
typedef struct FT_DriverRec_
{
FT_ModuleRec root;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_ListRec faces_list;
void* extensions;
diff --git a/src/base/ftapi.c b/src/base/ftapi.c
index 455b0b2..fff2dbe 100644
--- a/src/base/ftapi.c
+++ b/src/base/ftapi.c
@@ -291,7 +291,7 @@
FT_Face face,
FT_Driver driver )
{
- FT_Driver_Class* clazz = driver->clazz;
+ FT_Driver_Class clazz = driver->clazz;
/* discard auto-hinting data */
@@ -364,7 +364,7 @@
FT_Face* aface )
{
FT_Memory memory;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Face face = 0;
FT_Error error;
FT_Face_Internal internal;
@@ -671,7 +671,7 @@
FT_Error error;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
/* test for valid `parameters' delayed to ft_new_input_stream() */
@@ -748,7 +748,7 @@
FT_Error error;
FT_Memory memory;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Size size = 0;
FT_ListNode node = 0;
@@ -880,7 +880,7 @@
{
FT_Error error = FT_Err_Ok;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Size_Metrics* metrics;
FT_Long dim_x, dim_y;
@@ -949,7 +949,7 @@
{
FT_Error error = FT_Err_Ok;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Size_Metrics* metrics = &face->size->metrics;
@@ -1757,7 +1757,7 @@
FT_Driver driver = FT_DRIVER( module );
- driver->clazz = (FT_Driver_Class*)module->clazz;
+ driver->clazz = (FT_Driver_Class)module->clazz;
if ( FT_DRIVER_USES_OUTLINES( driver ) )
{
error = FT_GlyphLoader_New( memory, &driver->glyph_loader );
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 7b4d089..ef778d9 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -141,7 +141,7 @@
ft_glyphslot_init( FT_GlyphSlot slot )
{
FT_Driver driver = slot->face->driver;
- FT_Driver_Class* clazz = driver->clazz;
+ FT_Driver_Class clazz = driver->clazz;
FT_Memory memory = driver->root.memory;
FT_Error error = FT_Err_Ok;
FT_Slot_Internal internal;
@@ -201,7 +201,7 @@
ft_glyphslot_done( FT_GlyphSlot slot )
{
FT_Driver driver = slot->face->driver;
- FT_Driver_Class* clazz = driver->clazz;
+ FT_Driver_Class clazz = driver->clazz;
FT_Memory memory = driver->root.memory;
@@ -231,7 +231,7 @@
{
FT_Error error;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Memory memory;
FT_GlyphSlot slot;
@@ -558,7 +558,7 @@
FT_Face face,
FT_Driver driver )
{
- FT_Driver_Class* clazz = driver->clazz;
+ FT_Driver_Class clazz = driver->clazz;
/* discard auto-hinting data */
@@ -632,7 +632,7 @@
FT_Face* aface )
{
FT_Memory memory;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Face face = 0;
FT_Error error;
FT_Face_Internal internal;
@@ -939,7 +939,7 @@
FT_Error error;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
/* test for valid `parameters' delayed to ft_input_stream_new() */
@@ -1016,7 +1016,7 @@
FT_Error error;
FT_Memory memory;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Size size = 0;
FT_ListNode node = 0;
@@ -1148,7 +1148,7 @@
{
FT_Error error = FT_Err_Ok;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Size_Metrics* metrics;
FT_Long dim_x, dim_y;
@@ -1217,7 +1217,7 @@
{
FT_Error error = FT_Err_Ok;
FT_Driver driver;
- FT_Driver_Class* clazz;
+ FT_Driver_Class clazz;
FT_Size_Metrics* metrics = &face->size->metrics;
@@ -2116,7 +2116,7 @@
FT_Driver driver = FT_DRIVER( module );
- driver->clazz = (FT_Driver_Class*)module->clazz;
+ driver->clazz = (FT_Driver_Class)module->clazz;
if ( FT_DRIVER_USES_OUTLINES( driver ) )
{
error = FT_GlyphLoader_New( memory, &driver->glyph_loader );
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index 04d2057..77b9d81 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -459,7 +459,7 @@
/* The FT_DriverInterface structure is defined in ftdriver.h. */
FT_CALLBACK_TABLE_DEF
- const FT_Driver_Class cff_driver_class =
+ const FT_Driver_ClassRec cff_driver_class =
{
/* begin with the FT_Module_Class fields */
{
@@ -484,24 +484,24 @@
sizeof( FT_SizeRec ),
sizeof( CFF_GlyphSlotRec ),
- (FTDriver_initFace) CFF_Face_Init,
- (FTDriver_doneFace) CFF_Face_Done,
- (FTDriver_initSize) CFF_Size_Init,
- (FTDriver_doneSize) CFF_Size_Done,
- (FTDriver_initGlyphSlot)CFF_GlyphSlot_Init,
- (FTDriver_doneGlyphSlot)CFF_GlyphSlot_Done,
+ (FT_Face_InitFunc) CFF_Face_Init,
+ (FT_Face_DoneFunc) CFF_Face_Done,
+ (FT_Size_InitFunc) CFF_Size_Init,
+ (FT_Size_DoneFunc) CFF_Size_Done,
+ (FT_Slot_InitFunc)CFF_GlyphSlot_Init,
+ (FT_Slot_DoneFunc)CFF_GlyphSlot_Done,
- (FTDriver_setCharSizes) CFF_Size_Reset,
- (FTDriver_setPixelSizes)CFF_Size_Reset,
+ (FT_Size_ResetPointsFunc) CFF_Size_Reset,
+ (FT_Size_ResetPixelsFunc)CFF_Size_Reset,
- (FTDriver_loadGlyph) Load_Glyph,
- (FTDriver_getCharIndex) cff_get_char_index,
+ (FT_Slot_LoadFunc) Load_Glyph,
+ (FT_CharMap_CharIndexFunc) cff_get_char_index,
- (FTDriver_getKerning) Get_Kerning,
- (FTDriver_attachFile) 0,
- (FTDriver_getAdvances) 0,
+ (FT_Face_GetKerningFunc) Get_Kerning,
+ (FT_Face_AttachFunc) 0,
+ (FT_Face_GetAdvancesFunc) 0,
- (FTDriver_getNextChar) cff_get_next_char
+ (FT_CharMap_CharNextFunc) cff_get_next_char
};
@@ -527,7 +527,7 @@
/* format-specific interface can then be retrieved through the method */
/* interface->get_format_interface. */
/* */
- FT_EXPORT_DEF( const FT_Driver_Class* )
+ FT_EXPORT_DEF( const FT_Driver_Class )
getDriverClass( void )
{
return &cff_driver_class;
diff --git a/src/cff/cffdrivr.h b/src/cff/cffdrivr.h
index 8fd2247..1272796 100644
--- a/src/cff/cffdrivr.h
+++ b/src/cff/cffdrivr.h
@@ -28,7 +28,7 @@ FT_BEGIN_HEADER
FT_CALLBACK_TABLE
- const FT_Driver_Class cff_driver_class;
+ const FT_Driver_ClassRec cff_driver_class;
FT_END_HEADER
diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c
index 204993a..63dd8df 100644
--- a/src/cid/cidriver.c
+++ b/src/cid/cidriver.c
@@ -289,7 +289,7 @@
FT_CALLBACK_TABLE_DEF
- const FT_Driver_Class t1cid_driver_class =
+ const FT_Driver_ClassRec t1cid_driver_class =
{
/* first of all, the FT_Module_Class fields */
{
@@ -314,26 +314,26 @@
sizeof( CID_SizeRec ),
sizeof( CID_GlyphSlotRec ),
- (FTDriver_initFace) CID_Face_Init,
- (FTDriver_doneFace) CID_Face_Done,
+ (FT_Face_InitFunc) CID_Face_Init,
+ (FT_Face_DoneFunc) CID_Face_Done,
- (FTDriver_initSize) CID_Size_Init,
- (FTDriver_doneSize) CID_Size_Done,
- (FTDriver_initGlyphSlot)CID_GlyphSlot_Init,
- (FTDriver_doneGlyphSlot)CID_GlyphSlot_Done,
+ (FT_Size_InitFunc) CID_Size_Init,
+ (FT_Size_DoneFunc) CID_Size_Done,
+ (FT_Slot_InitFunc)CID_GlyphSlot_Init,
+ (FT_Slot_DoneFunc)CID_GlyphSlot_Done,
- (FTDriver_setCharSizes) CID_Size_Reset,
- (FTDriver_setPixelSizes)CID_Size_Reset,
+ (FT_Size_ResetPointsFunc) CID_Size_Reset,
+ (FT_Size_ResetPixelsFunc)CID_Size_Reset,
- (FTDriver_loadGlyph) CID_Load_Glyph,
- (FTDriver_getCharIndex) CID_Get_Char_Index,
+ (FT_Slot_LoadFunc) CID_Load_Glyph,
+ (FT_CharMap_CharIndexFunc) CID_Get_Char_Index,
- (FTDriver_getKerning) 0,
- (FTDriver_attachFile) 0,
+ (FT_Face_GetKerningFunc) 0,
+ (FT_Face_AttachFunc) 0,
- (FTDriver_getAdvances) 0,
+ (FT_Face_GetAdvancesFunc) 0,
- (FTDriver_getNextChar) CID_Get_Next_Char
+ (FT_CharMap_CharNextFunc) CID_Get_Next_Char
};
@@ -359,7 +359,7 @@
/* format-specific interface can then be retrieved through the method */
/* interface->get_format_interface. */
/* */
- FT_EXPORT_DEF( const FT_Driver_Class* )
+ FT_EXPORT_DEF( const FT_Driver_Class )
getDriverClass( void )
{
return &t1cid_driver_class;
diff --git a/src/cid/cidriver.h b/src/cid/cidriver.h
index 33e8481..9813a24 100644
--- a/src/cid/cidriver.h
+++ b/src/cid/cidriver.h
@@ -28,7 +28,7 @@ FT_BEGIN_HEADER
FT_CALLBACK_TABLE
- const FT_Driver_Class t1cid_driver_class;
+ const FT_Driver_ClassRec t1cid_driver_class;
FT_END_HEADER
diff --git a/src/pcf/pcfdriver.c b/src/pcf/pcfdriver.c
index dd71c45..281014e 100644
--- a/src/pcf/pcfdriver.c
+++ b/src/pcf/pcfdriver.c
@@ -325,7 +325,7 @@ THE SOFTWARE.
FT_CALLBACK_TABLE_DEF
- const FT_Driver_Class pcf_driver_class =
+ const FT_Driver_ClassRec pcf_driver_class =
{
{
ft_module_font_driver,
@@ -346,24 +346,24 @@ THE SOFTWARE.
sizeof( FT_SizeRec ),
sizeof( FT_GlyphSlotRec ),
- (FTDriver_initFace) PCF_Face_Init,
- (FTDriver_doneFace) PCF_Face_Done,
- (FTDriver_initSize) 0,
- (FTDriver_doneSize) 0,
- (FTDriver_initGlyphSlot)0,
- (FTDriver_doneGlyphSlot)0,
+ (FT_Face_InitFunc) PCF_Face_Init,
+ (FT_Face_DoneFunc) PCF_Face_Done,
+ (FT_Size_InitFunc) 0,
+ (FT_Size_DoneFunc) 0,
+ (FT_Slot_InitFunc)0,
+ (FT_Slot_DoneFunc)0,
- (FTDriver_setCharSizes) PCF_Set_Pixel_Size,
- (FTDriver_setPixelSizes)PCF_Set_Pixel_Size,
+ (FT_Size_ResetPointsFunc) PCF_Set_Pixel_Size,
+ (FT_Size_ResetPixelsFunc)PCF_Set_Pixel_Size,
- (FTDriver_loadGlyph) PCF_Glyph_Load,
- (FTDriver_getCharIndex) PCF_Char_Get_Index,
+ (FT_Slot_LoadFunc) PCF_Glyph_Load,
+ (FT_CharMap_CharIndexFunc) PCF_Char_Get_Index,
- (FTDriver_getKerning) 0,
- (FTDriver_attachFile) 0,
- (FTDriver_getAdvances) 0,
+ (FT_Face_GetKerningFunc) 0,
+ (FT_Face_AttachFunc) 0,
+ (FT_Face_GetAdvancesFunc) 0,
- (FTDriver_getNextChar) PCF_Char_Get_Next,
+ (FT_CharMap_CharNextFunc) PCF_Char_Get_Next,
};
@@ -389,7 +389,7 @@ THE SOFTWARE.
/* format-specific interface can then be retrieved through the method */
/* interface->get_format_interface. */
/* */
- FT_EXPORT_DEF( const FT_Driver_Class* )
+ FT_EXPORT_DEF( const FT_Driver_Class )
getDriverClass( void )
{
return &pcf_driver_class;
diff --git a/src/pcf/pcfdriver.h b/src/pcf/pcfdriver.h
index c59990a..0d38ad0 100644
--- a/src/pcf/pcfdriver.h
+++ b/src/pcf/pcfdriver.h
@@ -33,7 +33,7 @@ THE SOFTWARE.
FT_BEGIN_HEADER
- FT_EXPORT_VAR( const FT_Driver_Class ) pcf_driver_class;
+ FT_EXPORT_VAR( const FT_Driver_ClassRec ) pcf_driver_class;
FT_END_HEADER
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index dba942e..5b5ba70 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -477,7 +477,7 @@
/* The FT_DriverInterface structure is defined in ftdriver.h. */
FT_CALLBACK_TABLE_DEF
- const FT_Driver_Class tt_driver_class =
+ const FT_Driver_ClassRec tt_driver_class =
{
{
ft_module_font_driver |
@@ -506,23 +506,23 @@
sizeof ( FT_GlyphSlotRec ),
- (FTDriver_initFace) TT_Init_Face,
- (FTDriver_doneFace) TT_Done_Face,
- (FTDriver_initSize) TT_Init_Size,
- (FTDriver_doneSize) TT_Done_Size,
- (FTDriver_initGlyphSlot)0,
- (FTDriver_doneGlyphSlot)0,
+ (FT_Face_InitFunc) TT_Init_Face,
+ (FT_Face_DoneFunc) TT_Done_Face,
+ (FT_Size_InitFunc) TT_Init_Size,
+ (FT_Size_DoneFunc) TT_Done_Size,
+ (FT_Slot_InitFunc)0,
+ (FT_Slot_DoneFunc)0,
- (FTDriver_setCharSizes) Set_Char_Sizes,
- (FTDriver_setPixelSizes)Set_Pixel_Sizes,
- (FTDriver_loadGlyph) Load_Glyph,
- (FTDriver_getCharIndex) Get_Char_Index,
+ (FT_Size_ResetPointsFunc) Set_Char_Sizes,
+ (FT_Size_ResetPixelsFunc)Set_Pixel_Sizes,
+ (FT_Slot_LoadFunc) Load_Glyph,
+ (FT_CharMap_CharIndexFunc) Get_Char_Index,
- (FTDriver_getKerning) Get_Kerning,
- (FTDriver_attachFile) 0,
- (FTDriver_getAdvances) 0,
+ (FT_Face_GetKerningFunc) Get_Kerning,
+ (FT_Face_AttachFunc) 0,
+ (FT_Face_GetAdvancesFunc) 0,
- (FTDriver_getNextChar) Get_Next_Char
+ (FT_CharMap_CharNextFunc) Get_Next_Char
};
@@ -548,7 +548,7 @@
/* format-specific interface can then be retrieved through the method */
/* interface->get_format_interface. */
/* */
- FT_EXPORT_DEF( const FT_Driver_Class* )
+ FT_EXPORT_DEF( const FT_Driver_Class )
getDriverClass( void )
{
return &tt_driver_class;
diff --git a/src/truetype/ttdriver.h b/src/truetype/ttdriver.h
index 7c6f95e..e4f5aaf 100644
--- a/src/truetype/ttdriver.h
+++ b/src/truetype/ttdriver.h
@@ -27,7 +27,7 @@
FT_BEGIN_HEADER
- FT_EXPORT_VAR( const FT_Driver_Class ) tt_driver_class;
+ FT_EXPORT_VAR( const FT_Driver_ClassRec ) tt_driver_class;
FT_END_HEADER
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c
index 15652e4..118c7d5 100644
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -457,7 +457,7 @@
FT_CALLBACK_TABLE_DEF
- const FT_Driver_Class t1_driver_class =
+ const FT_Driver_ClassRec t1_driver_class =
{
{
ft_module_font_driver |
@@ -481,28 +481,28 @@
sizeof( T1_SizeRec ),
sizeof( T1_GlyphSlotRec ),
- (FTDriver_initFace) T1_Face_Init,
- (FTDriver_doneFace) T1_Face_Done,
- (FTDriver_initSize) T1_Size_Init,
- (FTDriver_doneSize) T1_Size_Done,
- (FTDriver_initGlyphSlot)T1_GlyphSlot_Init,
- (FTDriver_doneGlyphSlot)T1_GlyphSlot_Done,
+ (FT_Face_InitFunc) T1_Face_Init,
+ (FT_Face_DoneFunc) T1_Face_Done,
+ (FT_Size_InitFunc) T1_Size_Init,
+ (FT_Size_DoneFunc) T1_Size_Done,
+ (FT_Slot_InitFunc)T1_GlyphSlot_Init,
+ (FT_Slot_DoneFunc)T1_GlyphSlot_Done,
- (FTDriver_setCharSizes) T1_Size_Reset,
- (FTDriver_setPixelSizes)T1_Size_Reset,
- (FTDriver_loadGlyph) T1_Load_Glyph,
- (FTDriver_getCharIndex) Get_Char_Index,
+ (FT_Size_ResetPointsFunc) T1_Size_Reset,
+ (FT_Size_ResetPixelsFunc)T1_Size_Reset,
+ (FT_Slot_LoadFunc) T1_Load_Glyph,
+ (FT_CharMap_CharIndexFunc) Get_Char_Index,
#ifdef T1_CONFIG_OPTION_NO_AFM
- (FTDriver_getKerning) 0,
- (FTDriver_attachFile) 0,
+ (FT_Face_GetKerningFunc) 0,
+ (FT_Face_AttachFunc) 0,
#else
- (FTDriver_getKerning) Get_Kerning,
- (FTDriver_attachFile) T1_Read_AFM,
+ (FT_Face_GetKerningFunc) Get_Kerning,
+ (FT_Face_AttachFunc) T1_Read_AFM,
#endif
- (FTDriver_getAdvances) 0,
+ (FT_Face_GetAdvancesFunc) 0,
- (FTDriver_getNextChar) Get_Next_Char
+ (FT_CharMap_CharNextFunc) Get_Next_Char
};
@@ -528,7 +528,7 @@
/* format-specific interface can then be retrieved through the method */
/* interface->get_format_interface. */
/* */
- FT_EXPORT_DEF( const FT_Driver_Class* )
+ FT_EXPORT_DEF( const FT_Driver_Class )
getDriverClass( void )
{
return &t1_driver_class;
diff --git a/src/type1/t1driver.h b/src/type1/t1driver.h
index ce50800..518a94c 100644
--- a/src/type1/t1driver.h
+++ b/src/type1/t1driver.h
@@ -27,7 +27,7 @@
FT_BEGIN_HEADER
- FT_EXPORT_VAR( const FT_Driver_Class ) t1_driver_class;
+ FT_EXPORT_VAR( const FT_Driver_ClassRec ) t1_driver_class;
FT_END_HEADER
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index e26797c..9fbbccd 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -711,7 +711,7 @@
FT_CALLBACK_TABLE_DEF
- const FT_Driver_Class winfnt_driver_class =
+ const FT_Driver_ClassRec winfnt_driver_class =
{
{
ft_module_font_driver,
@@ -732,24 +732,24 @@
sizeof( FNT_SizeRec ),
sizeof( FT_GlyphSlotRec ),
- (FTDriver_initFace) FNT_Face_Init,
- (FTDriver_doneFace) FNT_Face_Done,
- (FTDriver_initSize) 0,
- (FTDriver_doneSize) 0,
- (FTDriver_initGlyphSlot)0,
- (FTDriver_doneGlyphSlot)0,
+ (FT_Face_InitFunc) FNT_Face_Init,
+ (FT_Face_DoneFunc) FNT_Face_Done,
+ (FT_Size_InitFunc) 0,
+ (FT_Size_DoneFunc) 0,
+ (FT_Slot_InitFunc)0,
+ (FT_Slot_DoneFunc)0,
- (FTDriver_setCharSizes) FNT_Size_Set_Pixels,
- (FTDriver_setPixelSizes)FNT_Size_Set_Pixels,
+ (FT_Size_ResetPointsFunc) FNT_Size_Set_Pixels,
+ (FT_Size_ResetPixelsFunc)FNT_Size_Set_Pixels,
- (FTDriver_loadGlyph) FNT_Load_Glyph,
- (FTDriver_getCharIndex) FNT_Get_Char_Index,
+ (FT_Slot_LoadFunc) FNT_Load_Glyph,
+ (FT_CharMap_CharIndexFunc) FNT_Get_Char_Index,
- (FTDriver_getKerning) 0,
- (FTDriver_attachFile) 0,
- (FTDriver_getAdvances) 0,
+ (FT_Face_GetKerningFunc) 0,
+ (FT_Face_AttachFunc) 0,
+ (FT_Face_GetAdvancesFunc) 0,
- (FTDriver_getNextChar) FNT_Get_Next_Char
+ (FT_CharMap_CharNextFunc) FNT_Get_Next_Char
};
@@ -775,7 +775,7 @@
/* format-specific interface can then be retrieved through the method */
/* interface->get_format_interface. */
/* */
- FT_EXPORT_DEF( const FT_Driver_Class* )
+ FT_EXPORT_DEF( const FT_Driver_Class )
getDriverClass( void )
{
return &winfnt_driver_class;
diff --git a/src/winfonts/winfnt.h b/src/winfonts/winfnt.h
index e3b6c55..7cf2cb9 100644
--- a/src/winfonts/winfnt.h
+++ b/src/winfonts/winfnt.h
@@ -27,7 +27,7 @@
FT_BEGIN_HEADER
- FT_EXPORT_VAR( const FT_Driver_Class ) winfnt_driver_class;
+ FT_EXPORT_VAR( const FT_Driver_ClassRec ) winfnt_driver_class;
FT_END_HEADER