Commit 4d57024d1c861443a981de6d7388548928349eee
2002-02-24T02:59:24
* moving all code related to glyph loaders to "internal/ftgloadr.h" and "src/base/ftgloadr.c". Note also that the type "FT_GlyphLoader" is now a pointer to the structure "FT_GlyphLoaderRec"..
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
diff --git a/ChangeLog b/ChangeLog
index 0fbf788..0f31ff4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2002-02-24 David Turner <david@freetype.org>
+ * moving all code related to glyph loaders to "internal/ftgloadr.h"
+ and "src/base/ftgloadr.c".
+
+ Note also that the type "FT_GlyphLoader" is now a pointer to the
+ structure "FT_GlyphLoaderRec"..
+
+
* renaming "ft_glyph_own_bitmap" into "FT_GLYPH_OWN_BITMAP"
2002-02-22 Werner Lemberg <wl@gnu.org>
diff --git a/include/freetype/internal/ftgloadr.h b/include/freetype/internal/ftgloadr.h
index 73479ca..ac3dcfb 100644
--- a/include/freetype/internal/ftgloadr.h
+++ b/include/freetype/internal/ftgloadr.h
@@ -32,7 +32,7 @@ FT_BEGIN_HEADER
/* The glyph loader implementation is not part of the high-level API, */
/* hence the forward structure declaration. */
/* */
- typedef struct FT_GlyphLoader_ FT_GlyphLoader ;
+ typedef struct FT_GlyphLoaderRec_* FT_GlyphLoader ;
#define FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS 1
@@ -89,7 +89,7 @@ FT_BEGIN_HEADER
/* create new empty glyph loader */
FT_BASE( FT_Error )
FT_GlyphLoader_New( FT_Memory memory,
- FT_GlyphLoader *aloader );
+ FT_GlyphLoader *aloader );
/* add an extra points table to a glyph loader */
FT_BASE( FT_Error )
diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index e934cff..a6bd132 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -31,6 +31,7 @@
#include FT_RENDER_H
#include FT_SIZES_H
#include FT_INTERNAL_MEMORY_H
+#include FT_INTERNAL_GLYPH_LOADER_H
#include FT_INTERNAL_DRIVER_H
#include FT_INTERNAL_AUTOHINT_H
@@ -76,22 +77,6 @@ FT_BEGIN_HEADER
/*************************************************************************/
/* */
/* <Struct> */
- /* FT_GlyphLoader */
- /* */
- /* <Description> */
- /* The glyph loader is an internal object used to load several glyphs */
- /* together (for example, in the case of composites). */
- /* */
- /* <Note> */
- /* The glyph loader implementation is not part of the high-level API, */
- /* hence the forward structure declaration. */
- /* */
- typedef struct FT_GlyphLoader_ FT_GlyphLoader;
-
-
- /*************************************************************************/
- /* */
- /* <Struct> */
/* FT_Face_InternalRec */
/* */
/* <Description> */
@@ -171,12 +156,12 @@ FT_BEGIN_HEADER
/* */
typedef struct FT_Slot_InternalRec_
{
- FT_GlyphLoader* loader;
+ FT_GlyphLoader loader;
FT_Bool glyph_transformed;
FT_Matrix glyph_matrix;
FT_Vector glyph_delta;
void* glyph_hints;
-
+
} FT_GlyphSlot_InternalRec;
@@ -345,6 +330,8 @@ FT_BEGIN_HEADER
FT_Done_GlyphSlot( FT_GlyphSlot slot );
+#if 0
+
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@@ -444,6 +431,7 @@ FT_BEGIN_HEADER
FT_GlyphLoader_Copy_Points( FT_GlyphLoader* target,
FT_GlyphLoader* source );
+#endif
/*************************************************************************/
/*************************************************************************/
@@ -533,7 +521,7 @@ FT_BEGIN_HEADER
FT_ListRec faces_list;
void* extensions;
- FT_GlyphLoader* glyph_loader;
+ FT_GlyphLoader glyph_loader;
} FT_DriverRec;
diff --git a/include/freetype/internal/internal.h b/include/freetype/internal/internal.h
index 32a06f9..054413c 100644
--- a/include/freetype/internal/internal.h
+++ b/include/freetype/internal/internal.h
@@ -33,7 +33,7 @@
#define FT_INTERNAL_DRIVER_H <freetype/internal/ftdriver.h>
#define FT_INTERNAL_EXTEND_H <freetype/internal/ftextend.h>
#define FT_INTERNAL_TRACE_H <freetype/internal/fttrace.h>
-
+#define FT_INTERNAL_GLYPH_LOADER_H <freetype/internal/ftgloadr.h>
#define FT_INTERNAL_SFNT_H <freetype/internal/sfnt.h>
#define FT_INTERNAL_TRUETYPE_TYPES_H <freetype/internal/tttypes.h>
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index 3881609..57265b7 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -508,7 +508,7 @@ FT_BEGIN_HEADER
FT_Memory memory;
FT_Face face;
FT_GlyphSlot glyph;
- FT_GlyphLoader* loader;
+ FT_GlyphLoader loader;
FT_Outline* base;
FT_Outline* current;
@@ -535,7 +535,7 @@ FT_BEGIN_HEADER
void* hints_funcs; /* hinter-specific */
void* hints_globals; /* hinter-specific */
- T1_Builder_Funcs funcs;
+ T1_Builder_Funcs funcs;
};
diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h
index 4177d1e..0b1efa8 100644
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -1615,7 +1615,7 @@ FT_BEGIN_HEADER
FT_Face face;
FT_Size size;
FT_GlyphSlot glyph;
- FT_GlyphLoader* gloader;
+ FT_GlyphLoader gloader;
FT_ULong load_flags;
FT_UInt glyph_index;
diff --git a/src/autohint/ahglyph.c b/src/autohint/ahglyph.c
index 49da901..94afa0d 100644
--- a/src/autohint/ahglyph.c
+++ b/src/autohint/ahglyph.c
@@ -351,7 +351,7 @@
/* */
FT_LOCAL_DEF void
ah_outline_save( AH_Outline* outline,
- AH_Loader* gloader )
+ AH_Loader gloader )
{
AH_Point* point = outline->points;
AH_Point* point_limit = point + outline->num_points;
diff --git a/src/autohint/ahglyph.h b/src/autohint/ahglyph.h
index 3c50ee7..8a85e77 100644
--- a/src/autohint/ahglyph.h
+++ b/src/autohint/ahglyph.h
@@ -79,7 +79,7 @@ FT_BEGIN_HEADER
FT_LOCAL void
ah_outline_save( AH_Outline* outline,
- AH_Loader* loader );
+ AH_Loader loader );
FT_LOCAL void
ah_outline_done( AH_Outline* outline );
diff --git a/src/autohint/ahhint.c b/src/autohint/ahhint.c
index 5c02589..7e0e286 100644
--- a/src/autohint/ahhint.c
+++ b/src/autohint/ahhint.c
@@ -388,7 +388,7 @@
ah_debug_disable_vert = no_vert_edges;
#else
FT_UNUSED( no_horz_edges );
- FT_UNUSED( no_vert_edges );
+ FT_UNUSED( no_vert_edges );
#endif
/* AH_Interpolate_Blue_Edges( hinter ); -- doesn't seem to help */
/* reduce the problem of the disappearing eye in the `e' of Times... */
@@ -1011,7 +1011,7 @@
FT_Fixed y_scale = face->size->metrics.y_scale;
FT_Error error;
AH_Outline* outline = hinter->glyph;
- AH_Loader* gloader = hinter->loader;
+ AH_Loader gloader = hinter->loader;
FT_Bool no_horz_hints = FT_BOOL(
( load_flags & AH_HINT_NO_HORZ_EDGES ) != 0 );
FT_Bool no_vert_hints = FT_BOOL(
diff --git a/src/autohint/ahloader.h b/src/autohint/ahloader.h
index 1f9b3a5..b5c1ba8 100644
--- a/src/autohint/ahloader.h
+++ b/src/autohint/ahloader.h
@@ -41,72 +41,7 @@
FT_BEGIN_HEADER
-
-#ifdef _STANDALONE_
-
- typedef struct AH_GlyphLoad_
- {
- FT_Outline outline; /* outline */
- FT_UInt num_subglyphs; /* number of subglyphs */
- FT_SubGlyph* subglyphs; /* subglyphs */
- FT_Vector* extra_points; /* extra points table */
-
- } AH_GlyphLoad;
-
-
- struct AH_GlyphLoader_
- {
- FT_Memory memory;
- FT_UInt max_points;
- FT_UInt max_contours;
- FT_UInt max_subglyphs;
- FT_Bool use_extra;
-
- AH_GlyphLoad base;
- AH_GlyphLoad current;
-
- void* other; /* for possible future extensions */
- };
-
-
- FT_LOCAL FT_Error
- AH_GlyphLoader_New( FT_Memory memory,
- AH_GlyphLoader** aloader );
-
- FT_LOCAL FT_Error
- AH_GlyphLoader_Create_Extra( AH_GlyphLoader* loader );
-
- FT_LOCAL void
- AH_GlyphLoader_Done( AH_GlyphLoader* loader );
-
- FT_LOCAL void
- AH_GlyphLoader_Reset( AH_GlyphLoader* loader );
-
- FT_LOCAL void
- AH_GlyphLoader_Rewind( AH_GlyphLoader* loader );
-
- FT_LOCAL FT_Error
- AH_GlyphLoader_Check_Points( AH_GlyphLoader* loader,
- FT_UInt n_points,
- FT_UInt n_contours );
-
- FT_LOCAL FT_Error
- AH_GlyphLoader_Check_Subglyphs( AH_GlyphLoader* loader,
- FT_UInt n_subs );
-
- FT_LOCAL void
- AH_GlyphLoader_Prepare( AH_GlyphLoader* loader );
-
- FT_LOCAL void
- AH_GlyphLoader_Add( AH_GlyphLoader* loader );
-
- FT_LOCAL FT_Error
- AH_GlyphLoader_Copy_Points( AH_GlyphLoader* target,
- FT_GlyphLoader* source );
-
-#else /* _STANDALONE */
-
-#include FT_INTERNAL_OBJECTS_H
+#include FT_INTERNAL_GLYPH_LOADER_H
#define AH_Load FT_GlyphLoad
#define AH_Loader FT_GlyphLoader
@@ -122,8 +57,6 @@ FT_BEGIN_HEADER
#define ah_loader_add FT_GlyphLoader_Add
#define ah_loader_copy_points FT_GlyphLoader_Copy_Points
-#endif /* _STANDALONE_ */
-
FT_END_HEADER
diff --git a/src/autohint/ahtypes.h b/src/autohint/ahtypes.h
index 83b4995..c05de7f 100644
--- a/src/autohint/ahtypes.h
+++ b/src/autohint/ahtypes.h
@@ -477,7 +477,7 @@ FT_BEGIN_HEADER
AH_Outline* glyph;
- AH_Loader* loader;
+ AH_Loader loader;
FT_Vector pp1;
FT_Vector pp2;
diff --git a/src/base/Jamfile b/src/base/Jamfile
index 5c2f5a6..3e2ff7e 100644
--- a/src/base/Jamfile
+++ b/src/base/Jamfile
@@ -10,7 +10,7 @@ SubDirHdrs [ FT2_SubDir src base ] ;
if $(FT2_MULTI)
{
- _sources = ftcalc ftlist ftobjs ftstream ftoutln ftnames fttrigon
+ _sources = ftcalc ftgloadr ftlist ftobjs ftstream ftoutln ftnames fttrigon
ftdbgmem ;
}
else
diff --git a/src/base/ftbase.c b/src/base/ftbase.c
index b49096b..83e0ad0 100644
--- a/src/base/ftbase.c
+++ b/src/base/ftbase.c
@@ -22,6 +22,7 @@
#include "ftcalc.c"
#include "fttrigon.c"
+#include "ftgloadr.c"
#include "ftobjs.c"
#include "ftstream.c"
#include "ftlist.c"
@@ -29,8 +30,4 @@
#include "ftnames.c"
#include "ftdbgmem.c"
-#if 0
-#include "ftextend.c"
-#endif
-
/* END */
diff --git a/src/base/ftgloadr.c b/src/base/ftgloadr.c
index e8a1556..5d3e075 100644
--- a/src/base/ftgloadr.c
+++ b/src/base/ftgloadr.c
@@ -1,5 +1,6 @@
#include <ft2build.h>
#include FT_INTERNAL_GLYPH_LOADER_H
+#include FT_INTERNAL_MEMORY_H
#undef FT_COMPONENT
#define FT_COMPONENT trace_gloader
@@ -65,8 +66,8 @@
FT_BASE_DEF( void )
FT_GlyphLoader_Rewind( FT_GlyphLoader loader )
{
- FT_GlyphLoad* base = &loader->base;
- FT_GlyphLoad* current = &loader->current;
+ FT_GlyphLoad base = &loader->base;
+ FT_GlyphLoad current = &loader->current;
base->outline.n_points = 0;
@@ -154,8 +155,8 @@
static void
FT_GlyphLoader_Adjust_Subglyphs( FT_GlyphLoader loader )
{
- FT_GlyphLoad* base = &loader->base;
- FT_GlyphLoad* current = &loader->current;
+ FT_GlyphLoad base = &loader->base;
+ FT_GlyphLoad current = &loader->current;
current->subglyphs = base->subglyphs + base->num_subglyphs;
@@ -235,8 +236,8 @@
FT_Error error = FT_Err_Ok;
FT_UInt new_max, old_max;
- FT_GlyphLoad* base = &loader->base;
- FT_GlyphLoad* current = &loader->current;
+ FT_GlyphLoad base = &loader->base;
+ FT_GlyphLoad current = &loader->current;
new_max = base->num_subglyphs + current->num_subglyphs + n_subs;
@@ -261,7 +262,7 @@
FT_BASE_DEF( void )
FT_GlyphLoader_Prepare( FT_GlyphLoader loader )
{
- FT_GlyphLoad* current = &loader->current;
+ FT_GlyphLoad current = &loader->current;
current->outline.n_points = 0;
@@ -277,8 +278,8 @@
FT_BASE_DEF( void )
FT_GlyphLoader_Add( FT_GlyphLoader loader )
{
- FT_GlyphLoad* base = &loader->base;
- FT_GlyphLoad* current = &loader->current;
+ FT_GlyphLoad base = &loader->base;
+ FT_GlyphLoad current = &loader->current;
FT_UInt n_curr_contours = current->outline.n_contours;
FT_UInt n_base_points = base->outline.n_points;
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 3b6b92d..3a7e2b3 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -262,6 +262,8 @@
#define FT_COMPONENT trace_objs
+#if 0
+
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/
@@ -598,6 +600,7 @@
return error;
}
+#endif
/*************************************************************************/
/*************************************************************************/
diff --git a/src/base/rules.mk b/src/base/rules.mk
index 2c6df87..2da51b3 100644
--- a/src/base/rules.mk
+++ b/src/base/rules.mk
@@ -34,6 +34,7 @@ BASE_COMPILE := $(FT_COMPILE) $I$(SRC_)base
#
BASE_SRC := $(BASE_)ftcalc.c \
$(BASE_)fttrigon.c \
+ $(BASE_)ftgloadr.c \
$(BASE_)ftlist.c \
$(BASE_)ftobjs.c \
$(BASE_)ftstream.c \
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index ab90795..7c3c340 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -238,7 +238,7 @@
if ( glyph )
{
- FT_GlyphLoader* loader = glyph->root.internal->loader;
+ FT_GlyphLoader loader = glyph->root.internal->loader;
builder->loader = loader;
@@ -248,7 +248,7 @@
builder->hints_globals = 0;
builder->hints_funcs = 0;
-
+
if ( hinting && size )
{
builder->hints_globals = size->internal;
@@ -588,7 +588,7 @@
if ( decoder->builder.no_recurse )
{
FT_GlyphSlot glyph = (FT_GlyphSlot)decoder->builder.glyph;
- FT_GlyphLoader* loader = glyph->internal->loader;
+ FT_GlyphLoader loader = glyph->internal->loader;
FT_SubGlyph* subg;
@@ -1091,7 +1091,7 @@
case cff_op_hintmask:
case cff_op_cntrmask:
FT_TRACE4(( op == cff_op_hintmask ? " hintmask" : " cntrmask" ));
-
+
/* implement vstem when needed -- */
/* the specification doesn't say it, but this also works */
/* with the 'cntrmask' operator */
@@ -1103,7 +1103,7 @@
0,
num_args / 2,
args );
-
+
decoder->num_hints += num_args / 2;
}
diff --git a/src/cff/cffgload.h b/src/cff/cffgload.h
index 55af7c4..c542adf 100644
--- a/src/cff/cffgload.h
+++ b/src/cff/cffgload.h
@@ -89,7 +89,7 @@ FT_BEGIN_HEADER
FT_Memory memory;
TT_Face face;
CFF_GlyphSlot glyph;
- FT_GlyphLoader* loader;
+ FT_GlyphLoader loader;
FT_Outline* base;
FT_Outline* current;
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index c497190..4856b21 100644
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -166,7 +166,7 @@
FT_Error error;
FT_Offset new_size = table->capacity;
FT_Long in_offset;
-
+
in_offset = (FT_Long)((FT_Byte*)object - table->block);
if ( (FT_ULong)in_offset >= table->capacity )
@@ -178,7 +178,7 @@
error = reallocate_t1_table( table, new_size );
if ( error )
return error;
-
+
if ( in_offset >= 0 )
object = table->block + in_offset;
}
@@ -1085,7 +1085,7 @@
if ( glyph )
{
- FT_GlyphLoader* loader = glyph->internal->loader;
+ FT_GlyphLoader loader = glyph->internal->loader;
builder->loader = loader;
@@ -1095,7 +1095,7 @@
builder->hints_globals = size->internal;
builder->hints_funcs = 0;
-
+
if ( hinting )
builder->hints_funcs = glyph->internal->glyph_hints;
}
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index 0a90394..fcd5cc9 100644
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -218,7 +218,7 @@
if ( decoder->builder.no_recurse )
{
FT_GlyphSlot glyph = (FT_GlyphSlot)decoder->builder.glyph;
- FT_GlyphLoader* loader = glyph->internal->loader;
+ FT_GlyphLoader loader = glyph->internal->loader;
FT_SubGlyph* subg;
@@ -290,7 +290,7 @@
decoder->builder.advance = advance;
/* XXX: old code doesn't work with postscript hinter */
-#if 0
+#if 0
/* Finally, move the accent */
if ( decoder->builder.load_points )
{
@@ -302,7 +302,7 @@
FT_Outline_Translate( &dummy, adx - asb, ady );
}
-#else
+#else
decoder->builder.pos_x = 0;
decoder->builder.pos_y = 0;
#endif
@@ -638,10 +638,10 @@
goto Syntax_Error;
}
ip += 2;
-
+
if ( hinter )
hinter->reset( hinter->hints, builder->current->n_points );
-
+
break;
case 12:
@@ -736,19 +736,19 @@
FT_TRACE4(( " endchar" ));
close_contour( builder );
-
+
/* close hints recording session */
if ( hinter )
{
if (hinter->close( hinter->hints, builder->current->n_points ))
goto Syntax_Error;
-
+
/* apply hints to the loaded glyph outline now */
hinter->apply( hinter->hints,
builder->current,
(PSH_Globals)builder->hints_globals );
}
-
+
/* add current outline to the glyph slot */
FT_GlyphLoader_Add( builder->loader );
@@ -1016,7 +1016,7 @@
case op_hstem:
FT_TRACE4(( " hstem" ));
-
+
/* record horizontal hint */
if ( hinter )
{
@@ -1032,7 +1032,7 @@
/* record horizontal counter-controlled hints */
if ( hinter )
hinter->stem3( hinter->hints, 1, top );
-
+
break;
case op_vstem:
@@ -1054,7 +1054,7 @@
if ( hinter )
{
FT_Pos dx = orig_x;
-
+
top[0] += dx;
top[2] += dx;
top[4] += dx;
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index d7104d7..7053caa 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -176,7 +176,7 @@
static void
tt_prepare_zone( TT_GlyphZone* zone,
- FT_GlyphLoad* load,
+ FT_GlyphLoad load,
FT_UInt start_point,
FT_UInt start_contour )
{
@@ -267,7 +267,7 @@
{
FT_Error error;
FT_Stream stream = load->stream;
- FT_GlyphLoader* gloader = load->gloader;
+ FT_GlyphLoader gloader = load->gloader;
FT_Int n_contours = load->n_contours;
FT_Outline* outline;
TT_Face face = (TT_Face)load->face;
@@ -470,7 +470,7 @@
{
FT_Error error;
FT_Stream stream = loader->stream;
- FT_GlyphLoader* gloader = loader->gloader;
+ FT_GlyphLoader gloader = loader->gloader;
FT_SubGlyph* subglyph;
FT_UInt num_subglyphs;
FT_Int byte_len = loader->byte_len;
@@ -606,7 +606,7 @@
TT_Process_Simple_Glyph( TT_Loader* load,
FT_Bool debug )
{
- FT_GlyphLoader* gloader = load->gloader;
+ FT_GlyphLoader gloader = load->gloader;
FT_Outline* outline = &gloader->current.outline;
FT_UInt n_points = outline->n_points;
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
@@ -751,7 +751,7 @@
FT_Int contours_count;
FT_UInt index, num_points, count;
FT_Fixed x_scale, y_scale;
- FT_GlyphLoader* gloader = loader->gloader;
+ FT_GlyphLoader gloader = loader->gloader;
FT_Bool opened_frame = 0;
@@ -1519,7 +1519,7 @@
/* update the glyph zone bounds */
{
- FT_GlyphLoader* gloader = FT_FACE_DRIVER(face)->glyph_loader;
+ FT_GlyphLoader gloader = FT_FACE_DRIVER(face)->glyph_loader;
loader.gloader = gloader;