Commit 7f615aef5ea990337d15c4cb3411737a0c63d583
2000-03-13T11:49:20
renamed all outlines functions to the FT_Outline_<action> syntax..
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
diff --git a/demos/src/fttimer.c b/demos/src/fttimer.c
index 79ddbac..295b675 100644
--- a/demos/src/fttimer.c
+++ b/demos/src/fttimer.c
@@ -177,7 +177,7 @@
#endif
/* create a new outline */
- FT_New_Outline( library,
+ FT_Outline_New( library,
glyph->outline.n_points,
glyph->outline.n_contours,
&outlines[cur_glyph] );
@@ -187,19 +187,19 @@
if (force_low)
glyph->outline.flags &= ~ft_outline_high_precision;
- FT_Copy_Outline( &glyph->outline, &outlines[cur_glyph] );
+ FT_Outline_Copy( &glyph->outline, &outlines[cur_glyph] );
/* center outline around 0 */
{
FT_BBox bbox;
- FT_Get_Outline_CBox( &glyph->outline, &bbox );
- FT_Translate_Outline( &outlines[cur_glyph],
+ FT_Outline_Get_CBox( &glyph->outline, &bbox );
+ FT_Outline_Translate( &outlines[cur_glyph],
- ( bbox.xMax - bbox.xMin )/2,
- ( bbox.yMax - bbox.yMin )/2 );
}
/* translate it */
- FT_Translate_Outline( &outlines[cur_glyph],
+ FT_Outline_Translate( &outlines[cur_glyph],
Bit.width * 32 ,
Bit.rows * 32 );
cur_glyph++;
@@ -222,7 +222,7 @@
if (use_grays)
return grays_raster_render( &raster, &outlines[index], &Bit );
else
- return FT_Get_Outline_Bitmap( library, &outlines[index], &Bit );
+ return FT_Outline_Get_Bitmap( library, &outlines[index], &Bit );
}
@@ -458,7 +458,7 @@
/* Now free all loaded outlines */
for ( Num = 0; Num < cur_glyph; Num++ )
- FT_Done_Outline( library, &outlines[Num] );
+ FT_Outline_Done( library, &outlines[Num] );
}
tz0 = Get_Time() - tz0;
diff --git a/demos/src/ftview.c b/demos/src/ftview.c
index 8936270..1376c1c 100644
--- a/demos/src/ftview.c
+++ b/demos/src/ftview.c
@@ -73,7 +73,7 @@
int graph_init = 0;
int render_mode = 1;
- int use_grays = 1;
+ int use_grays = 0;
TRaster raster;
@@ -185,7 +185,7 @@
bit3.buffer = bit_buffer;
bit3.grays = 128;
- FT_Translate_Outline( &glyph->outline, -left, -bottom );
+ FT_Outline_Translate( &glyph->outline, -left, -bottom );
memset( bit_buffer, 0, size );
if (low_prec)
@@ -194,7 +194,7 @@
if (use_grays & gray_render)
error = grays_raster_render( &raster, &glyph->outline, &bit2 );
else
- error = FT_Get_Outline_Bitmap( library, &glyph->outline, &bit2 );
+ error = FT_Outline_Get_Bitmap( library, &glyph->outline, &bit2 );
}
else
{
diff --git a/include/freetype.h b/include/freetype.h
index 795b6b4..4897588 100644
--- a/include/freetype.h
+++ b/include/freetype.h
@@ -2087,7 +2087,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Decompose_Outline */
+ /* FT_Outline_Decompose */
/* */
/* <Description> */
/* Walks over an outline's structure to decompose it into individual */
@@ -2109,7 +2109,7 @@
/* Error code. 0 means sucess. */
/* */
EXPORT_DEF
- int FT_Decompose_Outline( FT_Outline* outline,
+ int FT_Outline_Decompose( FT_Outline* outline,
FT_Outline_Funcs* interface,
void* user );
@@ -2117,7 +2117,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_New_Outline */
+ /* FT_Outline_New */
/* */
/* <Description> */
/* Creates a new outline of a given size. */
@@ -2149,7 +2149,7 @@
/* you want to control where the objects go. */
/* */
EXPORT_DEF
- FT_Error FT_New_Outline( FT_Library library,
+ FT_Error FT_Outline_New( FT_Library library,
FT_UInt numPoints,
FT_Int numContours,
FT_Outline* outline );
@@ -2158,10 +2158,10 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Done_Outline */
+ /* FT_Outline_Done */
/* */
/* <Description> */
- /* Destroys an outline created with FT_New_Outline(). */
+ /* Destroys an outline created with FT_Outline_New(). */
/* */
/* <Input> */
/* library :: A handle of the library object used to allocate the */
@@ -2185,13 +2185,13 @@
/* application if you want something simpler. */
/* */
EXPORT_DEF
- FT_Error FT_Done_Outline( FT_Library library,
+ FT_Error FT_Outline_Done( FT_Library library,
FT_Outline* outline );
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Get_Outline_CBox */
+ /* FT_Outline_Get_CBox */
/* */
/* <Description> */
/* Returns an outline's `control box'. The control box encloses all */
@@ -2218,14 +2218,14 @@
/* Yes. */
/* */
EXPORT_DEF
- FT_Error FT_Get_Outline_CBox( FT_Outline* outline,
+ FT_Error FT_Outline_Get_CBox( FT_Outline* outline,
FT_BBox* cbox );
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Translate_Outline */
+ /* FT_Outline_Translate */
/* */
/* <Description> */
/* Applies a simple translation to the points of an outline. */
@@ -2239,7 +2239,7 @@
/* Yes. */
/* */
EXPORT_DEF
- void FT_Translate_Outline( FT_Outline* outline,
+ void FT_Outline_Translate( FT_Outline* outline,
FT_Pos xOffset,
FT_Pos yOffset );
diff --git a/src/base/ftbbox.c b/src/base/ftbbox.c
index 2406359..61d156c 100644
--- a/src/base/ftbbox.c
+++ b/src/base/ftbbox.c
@@ -45,7 +45,7 @@
/* */
/* <Description> */
/* This function is used as a `move_to' and `line_to' emitter during */
- /* FT_Raster_Decompose(). It simply records the destination point in */
+ /* FT_Outline_Decompose. It simply records the destination point in */
/* `user->last'. */
/* */
/* <Input> */
@@ -338,7 +338,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Raster_GetBBox */
+ /* FT_Outline_Get_BBox */
/* */
/* <Description> */
/* Computes the exact bounding box of an outline. This is slower */
@@ -357,8 +357,8 @@
/* Error code. 0 means success. */
/* */
EXPORT_FUNC
- FT_Error FT_Raster_GetBBox( FT_Outline* outline,
- FT_BBox* abbox )
+ FT_Error FT_Outline_Get_BBox( FT_Outline* outline,
+ FT_BBox* abbox )
{
FT_BBox cbox;
FT_BBox bbox;
@@ -432,7 +432,7 @@
user.bbox = bbox;
- error = FT_Decompose_Outline( outline, &interface, &user );
+ error = FT_Outline_Decompose( outline, &interface, &user );
if ( error )
return error;
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index d9e45ff..58cca87 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -2011,7 +2011,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Decompose_Outline */
+ /* FT_Outline_Decompose */
/* */
/* <Description> */
/* Walks over an outline's structure to decompose it into individual */
@@ -2033,7 +2033,7 @@
/* Error code. 0 means sucess. */
/* */
EXPORT_FUNC
- int FT_Decompose_Outline( FT_Outline* outline,
+ int FT_Outline_Decompose( FT_Outline* outline,
FT_Outline_Funcs* interface,
void* user )
{
@@ -2262,7 +2262,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_New_Outline */
+ /* FT_Outline_New */
/* */
/* <Description> */
/* Creates a new outline of a given size. */
@@ -2294,7 +2294,7 @@
/* you want to control where the objects go. */
/* */
BASE_FUNC
- FT_Error FT_New_Outline( FT_Library library,
+ FT_Error FT_Outline_New( FT_Library library,
FT_UInt numPoints,
FT_Int numContours,
FT_Outline* outline )
@@ -2322,7 +2322,7 @@
Fail:
outline->flags |= ft_outline_owner;
- FT_Done_Outline( library, outline );
+ FT_Outline_Done( library, outline );
return error;
}
@@ -2331,10 +2331,10 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Done_Outline */
+ /* FT_Outline_Done */
/* */
/* <Description> */
- /* Destroys an outline created with FT_New_Outline(). */
+ /* Destroys an outline created with FT_Outline_New(). */
/* */
/* <Input> */
/* library :: A handle of the library object used to allocate the */
@@ -2358,7 +2358,7 @@
/* application if you want something simpler. */
/* */
BASE_FUNC
- FT_Error FT_Done_Outline( FT_Library library,
+ FT_Error FT_Outline_Done( FT_Library library,
FT_Outline* outline )
{
FT_Memory memory = library->memory;
@@ -2384,7 +2384,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Get_Outline_CBox */
+ /* FT_Outline_Get_CBox */
/* */
/* <Description> */
/* Returns an outline's `control box'. The control box encloses all */
@@ -2411,7 +2411,7 @@
/* Yes. */
/* */
BASE_FUNC
- FT_Error FT_Get_Outline_CBox( FT_Outline* outline,
+ FT_Error FT_Outline_Get_CBox( FT_Outline* outline,
FT_BBox* cbox )
{
FT_Pos xMin, yMin, xMax, yMax;
@@ -2462,7 +2462,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Translate_Outline */
+ /* FT_Outline_Translate */
/* */
/* <Description> */
/* Applies a simple translation to the points of an outline. */
@@ -2476,7 +2476,7 @@
/* Yes. */
/* */
BASE_FUNC
- void FT_Translate_Outline( FT_Outline* outline,
+ void FT_Outline_Translate( FT_Outline* outline,
FT_Pos xOffset,
FT_Pos yOffset )
{
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index 3dbeeb1..0253aba 100644
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c
@@ -32,7 +32,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Copy_Outline */
+ /* FT_Outline_Copy */
/* */
/* <Description> */
/* Copies an outline into another one. Both objects must have the */
@@ -47,7 +47,7 @@
/* FreeType error code. 0 means success. */
/* */
BASE_FUNC
- FT_Error FT_Copy_Outline( FT_Outline* source,
+ FT_Error FT_Outline_Copy( FT_Outline* source,
FT_Outline* target )
{
FT_Int is_owner;
@@ -79,7 +79,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Get_Outline_Bitmap */
+ /* FT_Outline_Get_Bitmap */
/* */
/* <Description> */
/* Renders an outline within a bitmap. The outline's image is simply */
@@ -105,7 +105,7 @@
/* It will use the raster correponding to the default glyph format. */
/* */
BASE_FUNC
- FT_Error FT_Get_Outline_Bitmap( FT_Library library,
+ FT_Error FT_Outline_Get_Bitmap( FT_Library library,
FT_Outline* outline,
FT_Bitmap* map )
{
@@ -128,7 +128,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Transform_Outline */
+ /* FT_Outline_Transform */
/* */
/* <Description> */
/* Applies a simple 2x2 matrix to all of an outline's points. Useful */
@@ -142,11 +142,11 @@
/* Yes. */
/* */
/* <Note> */
- /* You can use FT_Translate_Outline() if you need to translate the */
+ /* You can use FT_Outline_Translate() if you need to translate the */
/* outline's points. */
/* */
BASE_FUNC
- void FT_Transform_Outline( FT_Outline* outline,
+ void FT_Outline_Transform( FT_Outline* outline,
FT_Matrix* matrix )
{
FT_UShort n;
@@ -175,7 +175,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Transform_Vector */
+ /* FT_Vector_Transform */
/* */
/* <Description> */
/* Transforms a single vector through a 2x2 matrix. */
@@ -191,7 +191,7 @@
/* Yes. */
/* */
BASE_FUNC
- void FT_Transform_Vector( FT_Pos* x,
+ void FT_Vector_Transform( FT_Pos* x,
FT_Pos* y,
FT_Matrix* matrix )
{
diff --git a/src/base/ftoutln.h b/src/base/ftoutln.h
index c8ce7cc..07b0b55 100644
--- a/src/base/ftoutln.h
+++ b/src/base/ftoutln.h
@@ -6,7 +6,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Copy_Outline */
+ /* FT_Outline_Copy */
/* */
/* <Description> */
/* Copies an outline into another one. Both objects must have the */
@@ -21,13 +21,13 @@
/* FreeType error code. 0 means success. */
/* */
EXPORT_DEF
- FT_Error FT_Copy_Outline( FT_Outline* source,
+ FT_Error FT_Outline_Copy( FT_Outline* source,
FT_Outline* target );
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Get_Outline_Bitmap */
+ /* FT_Outline_Get_Bitmap */
/* */
/* <Description> */
/* Renders an outline within a bitmap. The outline's image is simply */
@@ -53,7 +53,7 @@
/* It will use the raster correponding to the default glyph format. */
/* */
EXPORT_DEF
- FT_Error FT_Get_Outline_Bitmap( FT_Library library,
+ FT_Error FT_Outline_Get_Bitmap( FT_Library library,
FT_Outline* outline,
FT_Bitmap* map );
@@ -61,7 +61,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Transform_Outline */
+ /* FT_Outline_Transform */
/* */
/* <Description> */
/* Applies a simple 2x2 matrix to all of an outline's points. Useful */
@@ -75,18 +75,18 @@
/* Yes. */
/* */
/* <Note> */
- /* You can use FT_Translate_Outline() if you need to translate the */
+ /* You can use FT_Outline_Translate() if you need to translate the */
/* outline's points. */
/* */
EXPORT_DEF
- void FT_Transform_Outline( FT_Outline* outline,
+ void FT_Outline_Transform( FT_Outline* outline,
FT_Matrix* matrix );
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Transform_Vector */
+ /* FT_Vector_Transform */
/* */
/* <Description> */
/* Transforms a single vector through a 2x2 matrix. */
@@ -102,7 +102,7 @@
/* Yes. */
/* */
EXPORT_DEF
- void FT_Transform_Vector( FT_Pos* x,
+ void FT_Vector_Transform( FT_Pos* x,
FT_Pos* y,
FT_Matrix* matrix );
diff --git a/src/base/ftraster.c b/src/base/ftraster.c
index a816840..f24926a 100644
--- a/src/base/ftraster.c
+++ b/src/base/ftraster.c
@@ -2215,7 +2215,7 @@
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Decompose_Outline */
+ /* FT_Outline_Decompose */
/* */
/* <Description> */
/* Walks over an outline's structure to decompose it into individual */
@@ -2237,7 +2237,7 @@
/* Error code. 0 means sucess. */
/* */
static
- int FT_Decompose_Outline( FT_Outline* outline,
+ int FT_Outline_Decompose( FT_Outline* outline,
FT_Outline_Funcs* interface,
void* user )
{
@@ -2500,7 +2500,7 @@
ras.num_profs = 0;
/* Now decompose curve */
- if ( FT_Decompose_Outline( outline, &interface, &ras ) )
+ if ( FT_Outline_Decompose( outline, &interface, &ras ) )
return FAILURE;
/* XXX: the error condition is in ras.error */
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index c9ebf09..33ac135 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -978,7 +978,7 @@
-loader->pp1.x,
0 );
- FT_Get_Outline_CBox( &glyph->outline, &bbox );
+ FT_Outline_Get_CBox( &glyph->outline, &bbox );
if ( IS_HINTED(loader->load_flags) )
{
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index 07cd145..abb9599 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -779,7 +779,7 @@
FT_TRACE4(( "TT.Init_GlyphSlot: Creating outline maxp = %d, maxc = %d\n",
face->max_points, face->max_contours ));
- return FT_New_Outline( library,
+ return FT_Outline_New( library,
face->max_points + 2,
face->max_contours,
&slot->outline );
@@ -803,7 +803,7 @@
FT_Library library = slot->face->driver->library;
- FT_Done_Outline( library, &slot->outline );
+ FT_Outline_Done( library, &slot->outline );
return;
}
diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c
index b2b6bb5..558ab6a 100644
--- a/src/type1/t1gload.c
+++ b/src/type1/t1gload.c
@@ -307,7 +307,7 @@
decoder->builder.advance = advance;
/* Finally, move the accent */
- FT_Translate_Outline( cur, adx - asb, ady );
+ FT_Outline_Translate( cur, adx - asb, ady );
(void)asb; /* ignore this parameter */
return T1_Err_Ok;
@@ -1510,7 +1510,7 @@
FT_BBox cbox;
FT_Glyph_Metrics* metrics = &glyph->root.metrics;
- FT_Get_Outline_CBox( &glyph->root.outline, &cbox );
+ FT_Outline_Get_CBox( &glyph->root.outline, &cbox );
/* grid fit the bounding box if necessary */
if (hinting)
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index fff4bf7..c5ba417 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -343,7 +343,7 @@
#endif
/* the bitmaps are created on demand */
FREE( glyph->root.bitmap.buffer );
- FT_Done_Outline( library, &glyph->root.outline );
+ FT_Outline_Done( library, &glyph->root.outline );
return;
}
@@ -371,13 +371,13 @@
glyph->max_contours = 0;
glyph->root.bitmap.buffer = 0;
- error = FT_New_Outline( library, 0, 0, &glyph->root.outline );
+ error = FT_Outline_New( library, 0, 0, &glyph->root.outline );
if (error) return error;
#ifndef T1_CONFIG_OPTION_DISABLE_HINTER
error = T1_New_Glyph_Hinter( glyph );
if (error)
- FT_Done_Outline( library, &glyph->root.outline );
+ FT_Outline_Done( library, &glyph->root.outline );
#endif
return error;
diff --git a/src/type1z/t1gload.c b/src/type1z/t1gload.c
index 79ee223..f152bba 100644
--- a/src/type1z/t1gload.c
+++ b/src/type1z/t1gload.c
@@ -516,7 +516,7 @@
/* Finally, move the accent */
if (decoder->builder.load_points)
- FT_Translate_Outline( cur, adx - asb, ady );
+ FT_Outline_Translate( cur, adx - asb, ady );
(void)asb; /* ignore this parameter */
return T1_Err_Ok;
@@ -1248,7 +1248,7 @@
FT_BBox cbox;
FT_Glyph_Metrics* metrics = &glyph->root.metrics;
- FT_Get_Outline_CBox( &glyph->root.outline, &cbox );
+ FT_Outline_Get_CBox( &glyph->root.outline, &cbox );
/* grid fit the bounding box if necessary */
if (hinting)
diff --git a/src/type1z/t1objs.c b/src/type1z/t1objs.c
index 82b4108..d46d709 100644
--- a/src/type1z/t1objs.c
+++ b/src/type1z/t1objs.c
@@ -309,7 +309,7 @@
/* the bitmaps are created on demand */
FREE( glyph->root.bitmap.buffer );
- FT_Done_Outline( library, &glyph->root.outline );
+ FT_Outline_Done( library, &glyph->root.outline );
return;
}
@@ -336,7 +336,7 @@
glyph->max_contours = 0;
glyph->root.bitmap.buffer = 0;
- return FT_New_Outline( library, 0, 0, &glyph->root.outline );
+ return FT_Outline_New( library, 0, 0, &glyph->root.outline );
}