Commit 8a6c44e67397711f10e9a0369b6737ba04b331c8
2007-01-04T17:03:11
Getting rid of the FT_OPTIMIZE_MEMORY macro, since the optimization is no longer experimental
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
diff --git a/ChangeLog b/ChangeLog
index 9848ef3..7ddb32c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-01-04 David Turner <david@freetype.org>
+ * src/sfnt/sfobjs.c, src/sfnt/ttkern.c, src/sfnt/ttkern.h,
+ src/sfnt/ttmtx.c, src/sfnt/ttsbit.c, src/sfnt/ttsbit.h,
+ src/truetype/ttpload.c, include/freetype/config/ftoption.h:
+ remove FT_OPTIMIZE_MEMORY macro, since the optimization is
+ no longer experimental
+
* src/pshinter/pshalgo.c: remove a stupid typo that results in no
hinting and a memory leak with some large Asian CFF fonts
diff --git a/devel/ftoption.h b/devel/ftoption.h
index af52199..aa92659 100644
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -594,11 +594,6 @@ FT_BEGIN_HEADER
/* */
- /*
- * This temporary macro is used to control various optimizations for
- * reducing the heap footprint of memory-mapped TrueType files.
- */
-#define FT_OPTIMIZE_MEMORY
/*
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index c590ddc..1f66c3a 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -594,12 +594,6 @@ FT_BEGIN_HEADER
/* */
- /*
- * This temporary macro is used to control various optimizations for
- * reducing the heap footprint of memory-mapped TrueType files.
- */
-#define FT_OPTIMIZE_MEMORY
-
/*
* Define this variable if you want to keep the layout of internal
diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h
index 7c0dc61..0f88f0f 100644
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -1395,7 +1395,6 @@ FT_BEGIN_HEADER
/* since version 2.2 */
-#ifdef FT_OPTIMIZE_MEMORY
FT_Byte* horz_metrics;
FT_ULong horz_metrics_size;
@@ -1420,7 +1419,6 @@ FT_BEGIN_HEADER
FT_UInt num_kern_tables;
FT_UInt32 kern_avail_bits;
FT_UInt32 kern_order_bits;
-#endif
#ifdef TT_CONFIG_OPTION_BDF
TT_BDFRec bdf;
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index c4a8c8d..80c026f 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -901,7 +901,7 @@
FT_UInt i, count;
-#if defined FT_OPTIMIZE_MEMORY && !defined FT_CONFIG_OPTION_OLD_INTERNALS
+#if !defined FT_CONFIG_OPTION_OLD_INTERNALS
count = face->sbit_num_strikes;
#else
count = (FT_UInt)face->num_sbit_strikes;
@@ -1008,7 +1008,7 @@
}
/* freeing the horizontal metrics */
-#if defined FT_OPTIMIZE_MEMORY && !defined FT_CONFIG_OPTION_OLD_INTERNALS
+#if !defined FT_CONFIG_OPTION_OLD_INTERNALS
{
FT_Stream stream = FT_FACE_STREAM( face );
diff --git a/src/sfnt/ttkern.c b/src/sfnt/ttkern.c
index 30f6cdb..15ff13f 100644
--- a/src/sfnt/ttkern.c
+++ b/src/sfnt/ttkern.c
@@ -41,8 +41,6 @@
#define TT_KERN_INDEX( g1, g2 ) ( ( (FT_ULong)(g1) << 16 ) | (g2) )
-#ifdef FT_OPTIMIZE_MEMORY
-
FT_LOCAL_DEF( FT_Error )
tt_face_load_kern( TT_Face face,
FT_Stream stream )
@@ -289,206 +287,6 @@
return result;
}
-#else /* !OPTIMIZE_MEMORY */
-
- FT_CALLBACK_DEF( int )
- tt_kern_pair_compare( const void* a,
- const void* b );
-
-
- FT_LOCAL_DEF( FT_Error )
- tt_face_load_kern( TT_Face face,
- FT_Stream stream )
- {
- FT_Error error;
- FT_Memory memory = stream->memory;
-
- FT_UInt n, num_tables;
-
-
- /* the kern table is optional; exit silently if it is missing */
- error = face->goto_table( face, TTAG_kern, stream, 0 );
- if ( error )
- return SFNT_Err_Ok;
-
- if ( FT_FRAME_ENTER( 4L ) )
- goto Exit;
-
- (void)FT_GET_USHORT(); /* version */
- num_tables = FT_GET_USHORT();
-
- FT_FRAME_EXIT();
-
- for ( n = 0; n < num_tables; n++ )
- {
- FT_UInt coverage;
- FT_UInt length;
-
-
- if ( FT_FRAME_ENTER( 6L ) )
- goto Exit;
-
- (void)FT_GET_USHORT(); /* version */
- length = FT_GET_USHORT() - 6; /* substract header length */
- coverage = FT_GET_USHORT();
-
- FT_FRAME_EXIT();
-
- if ( coverage == 0x0001 )
- {
- FT_UInt num_pairs;
- TT_Kern0_Pair pair;
- TT_Kern0_Pair limit;
-
-
- /* found a horizontal format 0 kerning table! */
- if ( FT_FRAME_ENTER( 8L ) )
- goto Exit;
-
- num_pairs = FT_GET_USHORT();
-
- /* skip the rest */
-
- FT_FRAME_EXIT();
-
- /* allocate array of kerning pairs */
- if ( FT_QNEW_ARRAY( face->kern_pairs, num_pairs ) ||
- FT_FRAME_ENTER( 6L * num_pairs ) )
- goto Exit;
-
- pair = face->kern_pairs;
- limit = pair + num_pairs;
- for ( ; pair < limit; pair++ )
- {
- pair->left = FT_GET_USHORT();
- pair->right = FT_GET_USHORT();
- pair->value = FT_GET_USHORT();
- }
-
- FT_FRAME_EXIT();
-
- face->num_kern_pairs = num_pairs;
- face->kern_table_index = n;
-
- /* ensure that the kerning pair table is sorted (yes, some */
- /* fonts have unsorted tables!) */
-
- if ( num_pairs > 0 )
- {
- TT_Kern0_Pair pair0 = face->kern_pairs;
- FT_ULong prev = TT_KERN_INDEX( pair0->left, pair0->right );
-
-
- for ( pair0++; pair0 < limit; pair0++ )
- {
- FT_ULong next = TT_KERN_INDEX( pair0->left, pair0->right );
-
-
- if ( next < prev )
- goto SortIt;
-
- prev = next;
- }
- goto Exit;
-
- SortIt:
- ft_qsort( (void*)face->kern_pairs, (int)num_pairs,
- sizeof ( TT_Kern0_PairRec ), tt_kern_pair_compare );
- }
-
- goto Exit;
- }
-
- if ( FT_STREAM_SKIP( length ) )
- goto Exit;
- }
-
- /* no kern table found -- doesn't matter */
- face->kern_table_index = -1;
- face->num_kern_pairs = 0;
- face->kern_pairs = NULL;
-
- Exit:
- return error;
- }
-
-
- FT_CALLBACK_DEF( int )
- tt_kern_pair_compare( const void* a,
- const void* b )
- {
- TT_Kern0_Pair pair1 = (TT_Kern0_Pair)a;
- TT_Kern0_Pair pair2 = (TT_Kern0_Pair)b;
-
- FT_ULong index1 = TT_KERN_INDEX( pair1->left, pair1->right );
- FT_ULong index2 = TT_KERN_INDEX( pair2->left, pair2->right );
-
- return index1 < index2 ? -1
- : ( index1 > index2 ? 1
- : 0 );
- }
-
-
- FT_LOCAL_DEF( void )
- tt_face_done_kern( TT_Face face )
- {
- FT_Memory memory = face->root.stream->memory;
-
-
- FT_FREE( face->kern_pairs );
- face->num_kern_pairs = 0;
- }
-
-
- FT_LOCAL_DEF( FT_Int )
- tt_face_get_kerning( TT_Face face,
- FT_UInt left_glyph,
- FT_UInt right_glyph )
- {
- FT_Int result = 0;
- TT_Kern0_Pair pair;
-
-
- if ( face && face->kern_pairs )
- {
- /* there are some kerning pairs in this font file! */
- FT_ULong search_tag = TT_KERN_INDEX( left_glyph, right_glyph );
- FT_Long left, right;
-
-
- left = 0;
- right = face->num_kern_pairs - 1;
-
- while ( left <= right )
- {
- FT_Long middle = left + ( ( right - left ) >> 1 );
- FT_ULong cur_pair;
-
-
- pair = face->kern_pairs + middle;
- cur_pair = TT_KERN_INDEX( pair->left, pair->right );
-
- if ( cur_pair == search_tag )
- goto Found;
-
- if ( cur_pair < search_tag )
- left = middle + 1;
- else
- right = middle - 1;
- }
- }
-
- Exit:
- return result;
-
- Found:
- result = pair->value;
- goto Exit;
- }
-
-#endif /* !OPTIMIZE_MEMORY */
-
-
#undef TT_KERN_INDEX
/* END */
diff --git a/src/sfnt/ttkern.h b/src/sfnt/ttkern.h
index 18b1381..77c1f9a 100644
--- a/src/sfnt/ttkern.h
+++ b/src/sfnt/ttkern.h
@@ -41,11 +41,7 @@ FT_BEGIN_HEADER
FT_UInt left_glyph,
FT_UInt right_glyph );
-#ifdef FT_OPTIMIZE_MEMORY
# define TT_FACE_HAS_KERNING( face ) ( (face)->kern_avail_bits != 0 )
-#else
-# define TT_FACE_HAS_KERNING( face ) ( (face)->kern_pairs != NULL )
-#endif
FT_END_HEADER
diff --git a/src/sfnt/ttmtx.c b/src/sfnt/ttmtx.c
index 180d0cb..c8fc220 100644
--- a/src/sfnt/ttmtx.c
+++ b/src/sfnt/ttmtx.c
@@ -60,7 +60,7 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
-#if defined FT_OPTIMIZE_MEMORY && !defined FT_CONFIG_OPTION_OLD_INTERNALS
+#if !defined FT_CONFIG_OPTION_OLD_INTERNALS
FT_LOCAL_DEF( FT_Error )
tt_face_load_hmtx( TT_Face face,
@@ -334,7 +334,7 @@
/* */
/* advance :: The advance width resp. advance height. */
/* */
-#if defined FT_OPTIMIZE_MEMORY && !defined FT_CONFIG_OPTION_OLD_INTERNALS
+#if !defined FT_CONFIG_OPTION_OLD_INTERNALS
FT_LOCAL_DEF( FT_Error )
tt_face_get_metrics( TT_Face face,
diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c
index d8a6522..d060343 100644
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -24,7 +24,7 @@
* Alas, the memory-optimized sbit loader can't be used when implementing
* the `old internals' hack
*/
-#if defined FT_OPTIMIZE_MEMORY && !defined FT_CONFIG_OPTION_OLD_INTERNALS
+#if !defined FT_CONFIG_OPTION_OLD_INTERNALS
#include "ttsbit0.c"
diff --git a/src/sfnt/ttsbit.h b/src/sfnt/ttsbit.h
index af52742..a6e5176 100644
--- a/src/sfnt/ttsbit.h
+++ b/src/sfnt/ttsbit.h
@@ -45,7 +45,7 @@ FT_BEGIN_HEADER
FT_ULong strike_index,
FT_Size_Metrics* metrics );
-#if !defined FT_OPTIMIZE_MEMORY || defined FT_CONFIG_OPTION_OLD_INTERNALS
+#if defined FT_CONFIG_OPTION_OLD_INTERNALS
FT_LOCAL( FT_Error )
tt_find_sbit_image( TT_Face face,
FT_UInt glyph_index,
@@ -59,7 +59,7 @@ FT_BEGIN_HEADER
TT_SBit_Range range,
TT_SBit_Metrics metrics );
-#endif /* !FT_OPTIMIZE_MEMORY || FT_CONFIG_OPTION_OLD_INTERNALS */
+#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
FT_LOCAL( FT_Error )
tt_face_load_sbit_image( TT_Face face,
diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c
index 0aa066b..65e8114 100644
--- a/src/truetype/ttpload.c
+++ b/src/truetype/ttpload.c
@@ -58,7 +58,6 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
-#ifdef FT_OPTIMIZE_MEMORY
FT_LOCAL_DEF( FT_Error )
tt_face_load_loca( TT_Face face,
@@ -183,135 +182,6 @@
}
-#else /* !FT_OPTIMIZE_MEMORY */
-
-
- FT_LOCAL_DEF( FT_Error )
- tt_face_load_loca( TT_Face face,
- FT_Stream stream )
- {
- FT_Error error;
- FT_Memory memory = stream->memory;
- FT_Short LongOffsets;
- FT_ULong table_len;
-
-
- /* we need the size of the `glyf' table for malformed `loca' tables */
- error = face->goto_table( face, TTAG_glyf, stream, &face->glyf_len );
- if ( error )
- goto Exit;
-
- FT_TRACE2(( "Locations " ));
- LongOffsets = face->header.Index_To_Loc_Format;
-
- error = face->goto_table( face, TTAG_loca, stream, &table_len );
- if ( error )
- {
- error = TT_Err_Locations_Missing;
- goto Exit;
- }
-
- if ( LongOffsets != 0 )
- {
- face->num_locations = (FT_UShort)( table_len >> 2 );
-
- FT_TRACE2(( "(32bit offsets): %12d ", face->num_locations ));
-
- if ( FT_NEW_ARRAY( face->glyph_locations, face->num_locations ) )
- goto Exit;
-
- if ( FT_FRAME_ENTER( face->num_locations * 4L ) )
- goto Exit;
-
- {
- FT_Long* loc = face->glyph_locations;
- FT_Long* limit = loc + face->num_locations;
-
-
- for ( ; loc < limit; loc++ )
- *loc = FT_GET_LONG();
- }
-
- FT_FRAME_EXIT();
- }
- else
- {
- face->num_locations = (FT_UShort)( table_len >> 1 );
-
- FT_TRACE2(( "(16bit offsets): %12d ", face->num_locations ));
-
- if ( FT_NEW_ARRAY( face->glyph_locations, face->num_locations ) )
- goto Exit;
-
- if ( FT_FRAME_ENTER( face->num_locations * 2L ) )
- goto Exit;
-
- {
- FT_Long* loc = face->glyph_locations;
- FT_Long* limit = loc + face->num_locations;
-
-
- for ( ; loc < limit; loc++ )
- *loc = (FT_Long)( (FT_ULong)FT_GET_USHORT() * 2 );
- }
-
- FT_FRAME_EXIT();
- }
-
- FT_TRACE2(( "loaded\n" ));
-
- Exit:
- return error;
- }
-
-
- FT_LOCAL_DEF( FT_ULong )
- tt_face_get_location( TT_Face face,
- FT_UInt gindex,
- FT_UInt *asize )
- {
- FT_ULong offset;
- FT_UInt count;
-
-
- offset = face->glyph_locations[gindex];
- count = 0;
-
- if ( gindex < (FT_UInt)face->num_locations - 1 )
- {
- FT_ULong offset1 = face->glyph_locations[gindex + 1];
-
-
- /* It isn't mentioned explicitly that the `loca' table must be */
- /* ordered, but implicitly it refers to the length of an entry */
- /* as the difference between the current and the next position. */
- /* Anyway, there do exist (malformed) fonts which don't obey */
- /* this rule, so we are only able to provide an upper bound for */
- /* the size. */
- if ( offset1 >= offset )
- count = (FT_UInt)( offset1 - offset );
- else
- count = (FT_UInt)( face->glyf_len - offset );
- }
-
- *asize = count;
- return offset;
- }
-
-
- FT_LOCAL_DEF( void )
- tt_face_done_loca( TT_Face face )
- {
- FT_Memory memory = face->root.memory;
-
-
- FT_FREE( face->glyph_locations );
- face->num_locations = 0;
- }
-
-
-#endif /* !FT_OPTIMIZE_MEMORY */
-
/*************************************************************************/
/* */
@@ -533,7 +403,6 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
-#ifdef FT_OPTIMIZE_MEMORY
FT_LOCAL_DEF( FT_Error )
tt_face_load_hdmx( TT_Face face,
@@ -621,114 +490,6 @@
FT_FRAME_RELEASE( face->hdmx_table );
}
-#else /* !FT_OPTIMIZE_MEMORY */
-
- FT_LOCAL_DEF( FT_Error )
- tt_face_load_hdmx( TT_Face face,
- FT_Stream stream )
- {
- FT_Error error;
- FT_Memory memory = stream->memory;
-
- TT_Hdmx hdmx = &face->hdmx;
- FT_Short num_records;
- FT_Long num_glyphs;
- FT_Long record_size;
-
-
- hdmx->version = 0;
- hdmx->num_records = 0;
- hdmx->records = 0;
-
- /* this table is optional */
- error = face->goto_table( face, TTAG_hdmx, stream, 0 );
- if ( error )
- return TT_Err_Ok;
-
- if ( FT_FRAME_ENTER( 8L ) )
- goto Exit;
-
- hdmx->version = FT_GET_USHORT();
- num_records = FT_GET_SHORT();
- record_size = FT_GET_LONG();
-
- FT_FRAME_EXIT();
-
- /* The maximum number of bytes in an hdmx device record is the */
- /* maximum number of glyphs + 2; this is 0xFFFF + 2; this is */
- /* the reason why `record_size' is a long. In practice, two */
- /* bytes sufficient to hold the size value. */
- /* */
- /* There are at least two fonts, HANNOM-A and HANNOM-B version */
- /* 2.0 (2005), which get this wrong: The upper two bytes of */
- /* the size value are set to 0xFF instead of 0x00. We catch */
- /* and fix this. */
-
- if ( (FT_ULong)record_size >= 0xFFFF0000UL )
- record_size = (FT_Long)( (FT_ULong)record_size & 0xFFFFU );
-
- if ( record_size < 0 || num_records < 0 )
- return TT_Err_Invalid_File_Format;
-
- /* Only recognize format 0 */
- if ( hdmx->version != 0 )
- return TT_Err_Invalid_File_Format;
-
- /* we can't use FT_QNEW_ARRAY here; otherwise tt_face_free_hdmx */
- /* could fail during deallocation */
- if ( FT_NEW_ARRAY( hdmx->records, num_records ) )
- goto Exit;
-
- hdmx->num_records = num_records;
- num_glyphs = face->root.num_glyphs;
- record_size -= num_glyphs + 2;
-
- {
- TT_HdmxEntry cur = hdmx->records;
- TT_HdmxEntry limit = cur + hdmx->num_records;
-
-
- for ( ; cur < limit; cur++ )
- {
- /* read record */
- if ( FT_READ_BYTE( cur->ppem ) ||
- FT_READ_BYTE( cur->max_width ) )
- goto Exit;
-
- if ( FT_QALLOC( cur->widths, num_glyphs ) ||
- FT_STREAM_READ( cur->widths, num_glyphs ) )
- goto Exit;
-
- /* skip padding bytes */
- if ( record_size > 0 && FT_STREAM_SKIP( record_size ) )
- goto Exit;
- }
- }
-
- Exit:
- return error;
- }
-
-
- FT_LOCAL_DEF( void )
- tt_face_free_hdmx( TT_Face face )
- {
- if ( face )
- {
- FT_Int n;
- FT_Memory memory = face->root.driver->root.memory;
-
-
- for ( n = 0; n < face->hdmx.num_records; n++ )
- FT_FREE( face->hdmx.records[n].widths );
-
- FT_FREE( face->hdmx.records );
- face->hdmx.num_records = 0;
- }
- }
-
-#endif /* !OPTIMIZE_MEMORY */
-
/*************************************************************************/
/* */
@@ -740,8 +501,6 @@
FT_UInt ppem,
FT_UInt gindex )
{
-#ifdef FT_OPTIMIZE_MEMORY
-
FT_UInt nn;
FT_Byte* result = NULL;
FT_ULong record_size = face->hdmx_record_size;
@@ -758,19 +517,6 @@
}
return result;
-
-#else
-
- FT_UShort n;
-
-
- for ( n = 0; n < face->hdmx.num_records; n++ )
- if ( face->hdmx.records[n].ppem == ppem )
- return &face->hdmx.records[n].widths[gindex];
-
- return NULL;
-
-#endif
}