Commit 7c25946f085d5aaec73aaf5dbeb1b9be6d8ecbff
2005-09-28T07:34:45
Formatting.
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 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064
diff --git a/ChangeLog b/ChangeLog
index 76b099f..8122dbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,31 +5,35 @@
2005-09-26 David Turner <david@freetype.org>
- * src/autofit/aflatin.c (af_latin_compute_stem_width): fixed bad
- computation of the "vertical" flag, causing ugly things in LCD mode
- and others.
+ * src/autofit/aflatin.c (af_latin_compute_stem_width): Fix bad
+ computation of the `vertical' flag, causing ugly things in LCD mode
+ and others.
2005-09-23 David Turner <david@freetype.org>
- * src/autofit/aflatin.c (af_latin_hints_init): fixed a bug that
- prevented internal hint mode bitflags from being computed correctly
+ * src/autofit/aflatin.c (af_latin_hints_init): Fix a bug that
+ prevented internal hint mode bitflags from being computed correctly.
- * src/base/Jamfile: adding src/base/ftgxval.c
-
- * src/gxvalid/gxvbsln.c, src/gxvalid/gxvcommn.c, src/gxvalid/gxvfeat.c,
- src/gxvalid/gxvjust.c, src/gxvalid/gxvkern.c, src/gxvalid/gxvlcar.c,
- src/gxvalid/gxvmort.c, src/gxvalid/gxvmort0.c, src/gxvalid/gxvmort1.c,
- src/gxvalid/gxvmort2.c, src/gxvalid/gxvmort4.c, src/gxvalid/gxvmort5.c,
- src/gxvalid/gxvmorx.c, src/gxvalid/gxvmorx0.c, src/gxvalid/gxvmorx1.c,
- src/gxvalid/gxvmorx2.c, src/gxvalid/gxvmorx5.c, src/gxvalid/gxvopbd.c,
- src/gxvalid/gxvprop.c, src/sfnt/sfdriver.c, src/truetype/ttgload.c:
- removing _many_ compiler warnings when compiling with Visual C++
- at maximum level (/W4)
-
- * src/autofit/afangles.c (af_angle_atan): replaced CORDIC-based
- implementation with one using lookup tables. This simple thing
- speeds glyph loading by 18% according to ftbench !
+ * src/base/Jamfile: Adding src/base/ftgxval.c.
+ * src/gxvalid/gxvbsln.c, src/gxvalid/gxvcommn.c,
+ src/gxvalid/gxvfeat.c, src/gxvalid/gxvjust.c, src/gxvalid/gxvkern.c,
+ src/gxvalid/gxvlcar.c, src/gxvalid/gxvmort.c,
+ src/gxvalid/gxvmort0.c, src/gxvalid/gxvmort1.c,
+ src/gxvalid/gxvmort2.c, src/gxvalid/gxvmort4.c,
+ src/gxvalid/gxvmort5.c, src/gxvalid/gxvmorx.c,
+ src/gxvalid/gxvmorx0.c, src/gxvalid/gxvmorx1.c,
+ src/gxvalid/gxvmorx2.c, src/gxvalid/gxvmorx5.c,
+ src/gxvalid/gxvopbd.c, src/gxvalid/gxvprop.c,
+ src/truetype/ttgload.c: Remove _many_ compiler warnings when
+ compiling with Visual C++ at maximum level (/W4).
+
+ * src/autofit/afangles.c (af_angle_atan): Replaced CORDIC-based
+ implementation with one using lookup tables. This simple thing
+ speeds up glyph loading by 18%, according to ftbench!
+
+ * src/sfnt/sfdriver.c (sfnt_get_interface): Don't check for
+ `get_sfnt' and `load_sfnt' module interfaces.
2005-09-22 Werner Lemberg <wl@gnu.org>
diff --git a/src/autofit/afangles.c b/src/autofit/afangles.c
index dfb7bf7..a59246d 100644
--- a/src/autofit/afangles.c
+++ b/src/autofit/afangles.c
@@ -25,7 +25,7 @@
/* the following table has been automatically generated with */
/* the `mather.py' Python script */
-#define AF_ATAN_BITS 8
+#define AF_ATAN_BITS 8
static const FT_Byte af_arctan[1L << AF_ATAN_BITS] =
{
@@ -125,6 +125,7 @@
#else /* 0 */
+
/*
* a python script used to generate the following table
*
@@ -323,6 +324,7 @@ for n in r:
#endif /* 0 */
+
FT_LOCAL_DEF( AF_Angle )
af_angle_diff( AF_Angle angle1,
AF_Angle angle2 )
diff --git a/src/gxvalid/gxvbsln.c b/src/gxvalid/gxvbsln.c
index 76ceeea..6cca658 100644
--- a/src/gxvalid/gxvbsln.c
+++ b/src/gxvalid/gxvbsln.c
@@ -132,7 +132,8 @@
GXV_LookupValueDesc value;
/* XXX: check range ? */
- offset = (FT_UShort)(base_value.u + ( relative_gindex * sizeof ( FT_UShort ) ));
+ offset = (FT_UShort)( base_value.u +
+ ( relative_gindex * sizeof ( FT_UShort ) ) );
p = valid->lookuptbl_head + offset;
limit = lookuptbl_limit;
diff --git a/src/gxvalid/gxvcommn.c b/src/gxvalid/gxvcommn.c
index bf31c76..82fd6b3 100644
--- a/src/gxvalid/gxvcommn.c
+++ b/src/gxvalid/gxvcommn.c
@@ -94,7 +94,7 @@
if ( j == nmemb )
FT_INVALID_OFFSET;
- *(length[i]) = (FT_UShort)(buff[j + 1] - buff[j]);
+ *(length[i]) = (FT_UShort)( buff[j + 1] - buff[j] );
if ( 0 != offset[i] && 0 == *(length[i]) )
FT_INVALID_OFFSET;
@@ -226,8 +226,8 @@
GXV_LIMIT_CHECK( 2 );
val = FT_NEXT_USHORT( p );
- *min = (FT_Byte) FT_MIN( *min, val );
- *max = (FT_Byte) FT_MAX( *max, val );
+ *min = (FT_Byte)FT_MIN( *min, val );
+ *max = (FT_Byte)FT_MAX( *max, val );
}
valid->subtable_length = p - table;
@@ -629,7 +629,7 @@
for ( gid = firstGlyph; gid <= lastGlyph; gid++ )
{
- value = valid->lookupfmt4_trans( (FT_UShort)(gid - firstGlyph),
+ value = valid->lookupfmt4_trans( (FT_UShort)( gid - firstGlyph ),
base_value,
limit,
valid );
@@ -742,14 +742,14 @@
glyphCount = FT_NEXT_USHORT( p );
gxv_glyphid_validate( firstGlyph, valid );
- gxv_glyphid_validate( (FT_UShort)(firstGlyph + glyphCount), valid );
+ gxv_glyphid_validate( (FT_UShort)( firstGlyph + glyphCount ), valid );
/* valueArray */
for ( i = 0; i < glyphCount; i++ )
{
GXV_LIMIT_CHECK( 2 );
value = GXV_LOOKUP_VALUE_LOAD( p, valid->lookupval_sign );
- valid->lookupval_func( (FT_UShort)(firstGlyph + i), value, valid );
+ valid->lookupval_func( (FT_UShort)( firstGlyph + i ), value, valid );
}
valid->subtable_length = p - table;
@@ -915,7 +915,7 @@
}
GXV_TRACE(( " nameIndex = %d (UNTITLED)\n", name_index ));
- FT_INVALID_DATA;
+ FT_INVALID_DATA;
goto Exit; /* make compiler happy */
Out:
@@ -972,7 +972,7 @@
if ( !nGlyphs )
goto Out;
- gxv_glyphid_validate( (FT_UShort)(firstGlyph + nGlyphs), valid );
+ gxv_glyphid_validate( (FT_UShort)( firstGlyph + nGlyphs ), valid );
{
FT_Byte nGlyphInClass[256];
@@ -1005,12 +1005,12 @@
break;
}
}
- *length_p = (FT_UShort)(p - table);
+ *length_p = (FT_UShort)( p - table );
/* scan max ClassID in use */
for ( i = 0; i < stateSize; i++ )
if ( ( 3 < i ) && ( nGlyphInClass[i] > 0 ) )
- *maxClassID_p = (FT_Byte)i; /* XXX: Check Range ? */
+ *maxClassID_p = (FT_Byte)i; /* XXX: Check Range? */
}
Out:
@@ -1036,14 +1036,14 @@
FT_Byte clazz;
FT_Byte entry;
+ FT_UNUSED( stateSize ); /* for the non-debugging case */
+
GXV_NAME_ENTER( "StateArray" );
GXV_TRACE(( "parse %d bytes by stateSize=%d maxClassID=%d\n",
(int)(*length_p), stateSize, (int)(maxClassID) ));
- FT_UNUSED( stateSize );
-
/*
* 2 states are predefined and must be described in StateArray:
* state 0 (start of text), 1 (start of line)
@@ -1060,13 +1060,13 @@
for ( clazz = 0; clazz <= maxClassID; clazz++ )
{
entry = FT_NEXT_BYTE( p );
- *maxEntry_p = (FT_Byte) FT_MAX( *maxEntry_p, entry );
+ *maxEntry_p = (FT_Byte)FT_MAX( *maxEntry_p, entry );
}
}
GXV_TRACE(( "parsed: maxState=%d, maxEntry=%d\n",
*maxState_p, *maxEntry_p ));
- *length_p = (FT_UShort)(p - table);
+ *length_p = (FT_UShort)( p - table );
GXV_EXIT;
}
@@ -1104,7 +1104,7 @@
FT_INVALID_TOO_SHORT;
/* ftxvalidator and FontValidator both warn and continue */
- maxEntry = (FT_Byte)(*length_p / entrySize - 1);
+ maxEntry = (FT_Byte)( *length_p / entrySize - 1 );
GXV_TRACE(( "too large maxEntry, shrinking to %d fit EntryTable length\n",
maxEntry ));
}
@@ -1139,12 +1139,12 @@
continue;
}
- state = (FT_Byte)(( newState - stateArray ) / ( 1 + maxClassID ));
+ state = (FT_Byte)( ( newState - stateArray ) / ( 1 + maxClassID ) );
switch ( GXV_GLYPHOFFSET_FMT( statetable ) )
{
case GXV_GLYPHOFFSET_NONE:
- glyphOffset.uc = 0; /* make compiler happy !! */
+ glyphOffset.uc = 0; /* make compiler happy */
break;
case GXV_GLYPHOFFSET_UCHAR:
@@ -1174,7 +1174,6 @@
default:
if ( valid->root->level >= FT_VALIDATE_PARANOID )
FT_INVALID_FORMAT;
-
goto Exit;
}
@@ -1186,8 +1185,9 @@
statetable_limit,
valid );
}
+
Exit:
- *length_p = (FT_UShort)(p - table);
+ *length_p = (FT_UShort)( p - table );
GXV_EXIT;
}
@@ -1269,7 +1269,7 @@
else
setup_func = gxv_StateTable_subtable_setup;
- setup_func( (FT_UShort)(limit - table),
+ setup_func( (FT_UShort)( limit - table ),
classTable,
stateArray,
entryTable,
@@ -1287,7 +1287,7 @@
&maxClassID,
valid );
else
- maxClassID = (FT_Byte)(stateSize - 1);
+ maxClassID = (FT_Byte)( stateSize - 1 );
if ( stateArray != 0 )
gxv_StateArray_validate( table + stateArray,
@@ -1400,8 +1400,9 @@
FT_UShort offset;
GXV_LookupValueDesc value;
- /* XXX: check range ? */
- offset = (FT_UShort)(base_value.u + relative_gindex * sizeof ( FT_UShort ));
+ /* XXX: check range? */
+ offset = (FT_UShort)( base_value.u +
+ relative_gindex * sizeof ( FT_UShort ) );
p = valid->lookuptbl_head + offset;
limit = lookuptbl_limit;
@@ -1427,14 +1428,14 @@
FT_UShort clazz;
FT_UShort entry;
+ FT_UNUSED( stateSize ); /* for the non-debugging case */
+
GXV_NAME_ENTER( "XStateArray" );
GXV_TRACE(( "parse % 3d bytes by stateSize=% 3d maxClassID=% 3d\n",
(int)(*length_p), stateSize, (int)(maxClassID) ));
- FT_UNUSED( stateSize );
-
/*
* 2 states are predefined and must be described:
* state 0 (start of text), 1 (start of line)
@@ -1451,7 +1452,7 @@
for ( clazz = 0; clazz <= maxClassID; clazz++ )
{
entry = FT_NEXT_USHORT( p );
- *maxEntry_p = (FT_UShort) FT_MAX( *maxEntry_p, entry );
+ *maxEntry_p = (FT_UShort)FT_MAX( *maxEntry_p, entry );
}
}
GXV_TRACE(( "parsed: maxState=%d, maxEntry=%d\n",
@@ -1505,7 +1506,7 @@
FT_INVALID_OFFSET;
}
- state = (FT_UShort)(newState_idx / ( 1 + maxClassID ));
+ state = (FT_UShort)( newState_idx / ( 1 + maxClassID ) );
if ( 0 != ( newState_idx % ( 1 + maxClassID ) ) )
{
FT_TRACE4(( "-> new state = %d (supposed)\n"
@@ -1639,9 +1640,9 @@
}
else
{
- /* XXX: check range ? */
+ /* XXX: check range? */
valid->xstatetable.maxClassID =
- (FT_UShort)(valid->xstatetable.nClasses - 1);
+ (FT_UShort)( valid->xstatetable.nClasses - 1 );
}
if ( stateArray != 0 )
diff --git a/src/gxvalid/gxvfeat.c b/src/gxvalid/gxvfeat.c
index 61ba48b..d7c6ad1 100644
--- a/src/gxvalid/gxvfeat.c
+++ b/src/gxvalid/gxvfeat.c
@@ -225,7 +225,7 @@
( featureFlags & GXV_FEAT_MASK_UNUSED ) == 0 )
FT_INVALID_DATA;
- exclusive = FT_BOOL(featureFlags & GXV_FEAT_MASK_EXCLUSIVE_SETTINGS);
+ exclusive = FT_BOOL( featureFlags & GXV_FEAT_MASK_EXCLUSIVE_SETTINGS );
if ( exclusive )
{
FT_Byte dynamic_default;
@@ -233,7 +233,7 @@
if ( featureFlags & GXV_FEAT_MASK_DYNAMIC_DEFAULT )
dynamic_default = (FT_Byte)( featureFlags &
- GXV_FEAT_MASK_DEFAULT_SETTING);
+ GXV_FEAT_MASK_DEFAULT_SETTING );
else
dynamic_default = 0;
diff --git a/src/gxvalid/gxvjust.c b/src/gxvalid/gxvjust.c
index 0919e01..29bf840 100644
--- a/src/gxvalid/gxvjust.c
+++ b/src/gxvalid/gxvjust.c
@@ -401,10 +401,10 @@
FT_UNUSED( valid );
- setMark = (FT_UShort)( (flags >> 15) & 1 );
- dontAdvance = (FT_UShort)( (flags >> 14) & 1);
- markClass = (FT_UShort)( (flags >> 7) & 0x7F );
- currentClass = (FT_UShort)( flags & 0x7F );
+ setMark = (FT_UShort)( ( flags >> 15 ) & 1 );
+ dontAdvance = (FT_UShort)( ( flags >> 14 ) & 1 );
+ markClass = (FT_UShort)( ( flags >> 7 ) & 0x7F );
+ currentClass = (FT_UShort)( flags & 0x7F );
/* TODO: validate markClass & currentClass */
}
diff --git a/src/gxvalid/gxvkern.c b/src/gxvalid/gxvkern.c
index 350326b..edc9af2 100644
--- a/src/gxvalid/gxvkern.c
+++ b/src/gxvalid/gxvkern.c
@@ -234,9 +234,9 @@
FT_UNUSED( glyphOffset );
- push = (FT_UShort)( (flags >> 15) & 1 );
- dontAdvance = (FT_UShort)( (flags >> 14) & 1 );
- valueOffset = (FT_UShort)( flags & 0x3FFF );
+ push = (FT_UShort)( ( flags >> 15 ) & 1 );
+ dontAdvance = (FT_UShort)( ( flags >> 14 ) & 1 );
+ valueOffset = (FT_UShort)( flags & 0x3FFF );
{
GXV_kern_fmt1_StateOptRecData vt_rec =
@@ -341,7 +341,7 @@
tag, firstGlyph, nGlyphs ));
gxv_glyphid_validate( firstGlyph, valid );
- gxv_glyphid_validate( (FT_UShort)(firstGlyph + nGlyphs - 1), valid );
+ gxv_glyphid_validate( (FT_UShort)( firstGlyph + nGlyphs - 1 ), valid );
gxv_array_getlimits_ushort( p, p + ( 2 * nGlyphs ),
&( GXV_KERN_FMT2_DATA( offset_min[spec] ) ),
@@ -512,15 +512,18 @@
FT_Bool kernCrossStream;
FT_Bool kernVariation;
+ FT_UNUSED( valid );
+
/* reserved bits = 0 */
if ( coverage & 0x1FFC )
return 0;
- kernVertical = FT_BOOL(( coverage >> 15 ) & 1);
- kernCrossStream = FT_BOOL(( coverage >> 14 ) & 1);
- kernVariation = FT_BOOL(( coverage >> 13 ) & 1);
- *format = (FT_UShort)( coverage & 0x0003 );
+ kernVertical = FT_BOOL( ( coverage >> 15 ) & 1 );
+ kernCrossStream = FT_BOOL( ( coverage >> 14 ) & 1 );
+ kernVariation = FT_BOOL( ( coverage >> 13 ) & 1 );
+
+ *format = (FT_UShort)( coverage & 0x0003 );
GXV_TRACE(( "new Apple-dialect: "
"horizontal=%d, cross-stream=%d, variation=%d, format=%d\n",
@@ -528,8 +531,6 @@
GXV_TRACE(( "kerning values in Apple format subtable are ignored\n" ));
- FT_UNUSED( valid );
-
return 1;
}
@@ -552,9 +553,10 @@
if ( coverage & 0x02FC )
return 0;
- horizontal = FT_BOOL(( coverage >> 15 ) & 1);
- cross_stream = FT_BOOL(( coverage >> 13 ) & 1);
- *format = (FT_UShort)( coverage & 0x0003 );
+ horizontal = FT_BOOL( ( coverage >> 15 ) & 1 );
+ cross_stream = FT_BOOL( ( coverage >> 13 ) & 1 );
+
+ *format = (FT_UShort)( coverage & 0x0003 );
GXV_TRACE(( "classic Apple-dialect: "
"horizontal=%d, cross-stream=%d, format=%d\n",
@@ -583,15 +585,17 @@
FT_UNUSED( valid );
+
/* reserved bits = 0 */
if ( coverage & 0xFDF0 )
return 0;
- horizontal = FT_BOOL( coverage & 1 );
- minimum = FT_BOOL(( coverage >> 1 ) & 1);
- cross_stream = FT_BOOL(( coverage >> 2 ) & 1);
- override = FT_BOOL(( coverage >> 3 ) & 1);
- *format = (FT_UShort)(( coverage >> 8 ) & 0x0003);
+ horizontal = FT_BOOL( coverage & 1 );
+ minimum = FT_BOOL( ( coverage >> 1 ) & 1 );
+ cross_stream = FT_BOOL( ( coverage >> 2 ) & 1 );
+ override = FT_BOOL( ( coverage >> 3 ) & 1 );
+
+ *format = (FT_UShort)( ( coverage >> 8 ) & 0x0003 );
GXV_TRACE(( "classic Microsoft-dialect: "
"horizontal=%d, minimum=%d, cross-stream=%d, "
diff --git a/src/gxvalid/gxvlcar.c b/src/gxvalid/gxvlcar.c
index e763c05..48821ea 100644
--- a/src/gxvalid/gxvlcar.c
+++ b/src/gxvalid/gxvlcar.c
@@ -157,8 +157,9 @@
FT_UNUSED( lookuptbl_limit );
- /* XXX: check range ? */
- offset = (FT_UShort)(base_value.u + relative_gindex * sizeof ( FT_UShort ));
+ /* XXX: check range? */
+ offset = (FT_UShort)( base_value.u +
+ relative_gindex * sizeof ( FT_UShort ) );
p = valid->root->base + offset;
limit = valid->root->limit;
diff --git a/src/gxvalid/gxvmort.c b/src/gxvalid/gxvmort.c
index 34b1179..6fb71b9 100644
--- a/src/gxvalid/gxvmort.c
+++ b/src/gxvalid/gxvmort.c
@@ -66,7 +66,7 @@
/* nSettings in gxvfeat.c is halved for exclusive on/off settings */
nSettings_max = gxv_feat_registry[f->featureType].nSettings;
if ( gxv_feat_registry[f->featureType].exclusive )
- nSettings_max = (FT_Byte)(2*nSettings_max);
+ nSettings_max = (FT_Byte)( 2 * nSettings_max );
GXV_TRACE(( "featureType %d is registered", f->featureType ));
GXV_TRACE(( "setting %d", f->featureSetting ));
diff --git a/src/gxvalid/gxvmort0.c b/src/gxvalid/gxvmort0.c
index 098753c..bb04589 100644
--- a/src/gxvalid/gxvmort0.c
+++ b/src/gxvalid/gxvmort0.c
@@ -79,15 +79,16 @@
FT_UNUSED( table );
FT_UNUSED( limit );
+ FT_UNUSED( GXV_Mort_IndicScript_Msg[verb] ); /* for the non-debugging */
+ FT_UNUSED( glyphOffset ); /* case */
- markFirst = (FT_UShort)( (flags >> 15) & 1 );
- dontAdvance = (FT_UShort)( (flags >> 14) & 1 );
- markLast = (FT_UShort)( (flags >> 13) & 1 );
- reserved = (FT_UShort)( flags & 0x1FF0 );
- verb = (FT_UShort)( flags & 0x000F );
- FT_UNUSED( GXV_Mort_IndicScript_Msg[verb] );
- FT_UNUSED( glyphOffset );
+ markFirst = (FT_UShort)( ( flags >> 15 ) & 1 );
+ dontAdvance = (FT_UShort)( ( flags >> 14 ) & 1 );
+ markLast = (FT_UShort)( ( flags >> 13 ) & 1 );
+
+ reserved = (FT_UShort)( flags & 0x1FF0 );
+ verb = (FT_UShort)( flags & 0x000F );
GXV_TRACE(( " IndicScript MorphRule for glyphOffset 0x%04x",
glyphOffset.u ));
@@ -97,8 +98,6 @@
GXV_TRACE(( " %02d", verb ));
GXV_TRACE(( " %s\n", GXV_Mort_IndicScript_Msg[verb] ));
-
-
if ( 0 < reserved )
{
GXV_TRACE(( " non-zero bits found in reserved range\n" ));
diff --git a/src/gxvalid/gxvmort1.c b/src/gxvalid/gxvmort1.c
index e37af64..0b4c180 100644
--- a/src/gxvalid/gxvmort1.c
+++ b/src/gxvalid/gxvmort1.c
@@ -113,16 +113,19 @@
FT_UNUSED( state );
- substTable = ((GXV_mort_subtable_type1_StateOptRec *)
- (valid->statetable.optdata))->substitutionTable;
- substTable_limit = (FT_UShort)(substTable +
- ((GXV_mort_subtable_type1_StateOptRec *)
- (valid->statetable.optdata))->substitutionTable_length);
+ substTable =
+ ((GXV_mort_subtable_type1_StateOptRec *)
+ (valid->statetable.optdata))->substitutionTable;
+ substTable_limit =
+ (FT_UShort)( substTable +
+ ((GXV_mort_subtable_type1_StateOptRec *)
+ (valid->statetable.optdata))->substitutionTable_length );
- min_gid = (FT_UShort)(( substTable - wordOffset * 2 ) / 2);
- max_gid = (FT_UShort)(( substTable_limit - wordOffset * 2 ) / 2);
- max_gid = (FT_UShort)(FT_MAX( max_gid, valid->face->num_glyphs ));
- /* XXX: check range ? */
+ min_gid = (FT_UShort)( ( substTable - wordOffset * 2 ) / 2 );
+ max_gid = (FT_UShort)( ( substTable_limit - wordOffset * 2 ) / 2 );
+ max_gid = (FT_UShort)( FT_MAX( max_gid, valid->face->num_glyphs ) );
+
+ /* XXX: check range? */
/* TODO: min_gid & max_gid comparison with ClassTable contents */
}
@@ -147,11 +150,12 @@
FT_UNUSED( limit );
- setMark = (FT_UShort)( flags >> 15);
- dontAdvance = (FT_UShort)((flags >> 14) & 1);
- reserved = (FT_Short)( flags & 0x3FFF );
+ setMark = (FT_UShort)( flags >> 15 );
+ dontAdvance = (FT_UShort)( ( flags >> 14 ) & 1 );
+ reserved = (FT_Short)( flags & 0x3FFF );
+
markOffset = (FT_Short)( glyphOffset.ul >> 16 );
- currentOffset = (FT_Short)( glyphOffset.ul );
+ currentOffset = (FT_Short)( glyphOffset.ul );
if ( 0 < reserved )
{
@@ -180,7 +184,7 @@
FT_Bytes p = table;
FT_UShort num_gids = (FT_UShort)(
((GXV_mort_subtable_type1_StateOptRec *)
- (valid->statetable.optdata))->substitutionTable_length / 2);
+ (valid->statetable.optdata))->substitutionTable_length / 2 );
FT_UShort i;
diff --git a/src/gxvalid/gxvmort2.c b/src/gxvalid/gxvmort2.c
index a62b211..92ccf06 100644
--- a/src/gxvalid/gxvmort2.c
+++ b/src/gxvalid/gxvmort2.c
@@ -177,8 +177,9 @@
lig_action = FT_NEXT_ULONG( p );
- last = (FT_UShort)( (lig_action >> 31) & 1 );
- store = (FT_UShort)( (lig_action >> 30) & 1 );
+ last = (FT_UShort)( ( lig_action >> 31 ) & 1 );
+ store = (FT_UShort)( ( lig_action >> 30 ) & 1 );
+
offset = lig_action & 0x3FFFFFFFUL;
}
}
@@ -202,9 +203,10 @@
FT_UNUSED( limit );
- setComponent = (FT_UShort)( (flags >> 15) & 1 );
- dontAdvance = (FT_UShort)( (flags >> 14) & 1 );
- offset = (FT_UShort)( flags & 0x3FFFU );
+ setComponent = (FT_UShort)( ( flags >> 15 ) & 1 );
+ dontAdvance = (FT_UShort)( ( flags >> 14 ) & 1 );
+
+ offset = (FT_UShort)( flags & 0x3FFFU );
if ( 0 < offset )
gxv_mort_subtable_type2_ligActionOffset_validate( table, offset,
diff --git a/src/gxvalid/gxvmort4.c b/src/gxvalid/gxvmort4.c
index 9b7d982..a04bc1e 100644
--- a/src/gxvalid/gxvmort4.c
+++ b/src/gxvalid/gxvmort4.c
@@ -87,8 +87,9 @@
FT_UShort offset;
GXV_LookupValueDesc value;
- /* XXX: check range */
- offset = (FT_UShort)(base_value.u + relative_gindex * sizeof ( FT_UShort ));
+ /* XXX: check range? */
+ offset = (FT_UShort)( base_value.u +
+ relative_gindex * sizeof ( FT_UShort ) );
p = valid->lookuptbl_head + offset;
limit = lookuptbl_limit;
diff --git a/src/gxvalid/gxvmort5.c b/src/gxvalid/gxvmort5.c
index 402096a..a7cabc3 100644
--- a/src/gxvalid/gxvmort5.c
+++ b/src/gxvalid/gxvmort5.c
@@ -158,16 +158,18 @@
FT_UNUSED( state );
- setMark = FT_BOOL(( flags >> 15 ) & 1);
- dontAdvance = FT_BOOL(( flags >> 14 ) & 1);
- currentIsKashidaLike = FT_BOOL(( flags >> 13 ) & 1);
- markedIsKashidaLike = FT_BOOL(( flags >> 12 ) & 1);
- currentInsertBefore = FT_BOOL(( flags >> 11 ) & 1);
- markedInsertBefore = FT_BOOL(( flags >> 10 ) & 1);
- currentInsertCount = (FT_Byte)( (flags >> 5) & 0x1F );
- markedInsertCount = (FT_Byte)( flags & 0x001F );
+ setMark = FT_BOOL( ( flags >> 15 ) & 1 );
+ dontAdvance = FT_BOOL( ( flags >> 14 ) & 1 );
+ currentIsKashidaLike = FT_BOOL( ( flags >> 13 ) & 1 );
+ markedIsKashidaLike = FT_BOOL( ( flags >> 12 ) & 1 );
+ currentInsertBefore = FT_BOOL( ( flags >> 11 ) & 1 );
+ markedInsertBefore = FT_BOOL( ( flags >> 10 ) & 1 );
+
+ currentInsertCount = (FT_Byte)( ( flags >> 5 ) & 0x1F );
+ markedInsertCount = (FT_Byte)( flags & 0x001F );
+
currentInsertList = (FT_UShort)( glyphOffset.ul >> 16 );
- markedInsertList = (FT_UShort)( glyphOffset.ul );
+ markedInsertList = (FT_UShort)( glyphOffset.ul );
if ( 0 != currentInsertList && 0 != currentInsertCount )
{
diff --git a/src/gxvalid/gxvmorx.c b/src/gxvalid/gxvmorx.c
index c3748a3..849d5e9 100644
--- a/src/gxvalid/gxvmorx.c
+++ b/src/gxvalid/gxvmorx.c
@@ -85,7 +85,7 @@
GXV_LIMIT_CHECK( rest );
/* morx coverage consists of mort_coverage & 16bit padding */
- gxv_mort_coverage_validate( (FT_UShort)(( coverage >> 16 ) | coverage),
+ gxv_mort_coverage_validate( (FT_UShort)( ( coverage >> 16 ) | coverage ),
valid );
if ( type > 5 )
FT_INVALID_FORMAT;
diff --git a/src/gxvalid/gxvmorx0.c b/src/gxvalid/gxvmorx0.c
index dddf583..ca92b6c 100644
--- a/src/gxvalid/gxvmorx0.c
+++ b/src/gxvalid/gxvmorx0.c
@@ -59,11 +59,12 @@
FT_UNUSED( limit );
- markFirst = (FT_UShort)( (flags >> 15) & 1 );
- dontAdvance = (FT_UShort)( (flags >> 14) & 1 );
- markLast = (FT_UShort)( (flags >> 13) & 1 );
- reserved = (FT_UShort)( flags & 0x1FF0 );
- verb = (FT_UShort)( flags & 0x000F );
+ markFirst = (FT_UShort)( ( flags >> 15 ) & 1 );
+ dontAdvance = (FT_UShort)( ( flags >> 14 ) & 1 );
+ markLast = (FT_UShort)( ( flags >> 13 ) & 1 );
+
+ reserved = (FT_UShort)( flags & 0x1FF0 );
+ verb = (FT_UShort)( flags & 0x000F );
if ( 0 < reserved )
{
diff --git a/src/gxvalid/gxvmorx1.c b/src/gxvalid/gxvmorx1.c
index e2caddc..4090be9 100644
--- a/src/gxvalid/gxvmorx1.c
+++ b/src/gxvalid/gxvmorx1.c
@@ -122,11 +122,13 @@
FT_UNUSED( limit );
- setMark = (FT_UShort)( (flags >> 15) & 1 );
- dontAdvance = (FT_UShort)( (flags >> 14) & 1 );
- reserved = (FT_UShort)( flags & 0x3FFF );
+ setMark = (FT_UShort)( ( flags >> 15 ) & 1 );
+ dontAdvance = (FT_UShort)( ( flags >> 14 ) & 1 );
+
+ reserved = (FT_UShort)( flags & 0x3FFF );
+
markIndex = (FT_Short)( glyphOffset.ul >> 16 );
- currentIndex = (FT_Short)( glyphOffset.ul );
+ currentIndex = (FT_Short)( glyphOffset.ul );
GXV_TRACE(( " setMark=%01d dontAdvance=%01d\n",
setMark, dontAdvance ));
@@ -142,10 +144,12 @@
markIndex, currentIndex ));
if ( optdata->substitutionTable_num_lookupTables < markIndex + 1 )
- optdata->substitutionTable_num_lookupTables = (FT_Short)(markIndex + 1);
+ optdata->substitutionTable_num_lookupTables =
+ (FT_Short)( markIndex + 1 );
if ( optdata->substitutionTable_num_lookupTables < currentIndex + 1 )
- optdata->substitutionTable_num_lookupTables = (FT_Short)(currentIndex + 1);
+ optdata->substitutionTable_num_lookupTables =
+ (FT_Short)( currentIndex + 1 );
}
@@ -154,9 +158,9 @@
GXV_LookupValueDesc value,
GXV_Validator valid )
{
- GXV_TRACE(( "morx subtable type1 subst.: %d -> %d\n", glyph, value.u ));
+ FT_UNUSED( glyph ); /* for the non-debugging case */
- FT_UNUSED( glyph );
+ GXV_TRACE(( "morx subtable type1 subst.: %d -> %d\n", glyph, value.u ));
if ( value.u > valid->face->num_glyphs )
FT_INVALID_GLYPH_ID;
@@ -175,8 +179,9 @@
FT_UShort offset;
GXV_LookupValueDesc value;
- /* XXX: check range ? */
- offset = (FT_UShort)(base_value.u + relative_gindex * sizeof ( FT_UShort ));
+ /* XXX: check range? */
+ offset = (FT_UShort)( base_value.u +
+ relative_gindex * sizeof ( FT_UShort ) );
p = valid->lookuptbl_head + offset;
limit = lookuptbl_limit;
diff --git a/src/gxvalid/gxvmorx2.c b/src/gxvalid/gxvmorx2.c
index 7493b0e..5cad516 100644
--- a/src/gxvalid/gxvmorx2.c
+++ b/src/gxvalid/gxvmorx2.c
@@ -174,9 +174,10 @@
lig_action = FT_NEXT_ULONG( p );
- last = (FT_UShort)( (lig_action >> 31) & 1 );
- store = (FT_UShort)( (lig_action >> 30) & 1 );
- offset = lig_action & 0x3FFFFFFFUL;
+ last = (FT_UShort)( ( lig_action >> 31 ) & 1 );
+ store = (FT_UShort)( ( lig_action >> 30 ) & 1 );
+
+ offset = lig_action & 0x3FFFFFFFUL;
}
}
@@ -200,10 +201,11 @@
FT_UNUSED( limit );
- setComponent = (FT_UShort)( (flags >> 15) & 1 );
- dontAdvance = (FT_UShort)( (flags >> 14) & 1 );
- performAction = (FT_UShort)( (flags >> 13) & 1 );
- reserved = (FT_UShort)( flags & 0x1FFF );
+ setComponent = (FT_UShort)( ( flags >> 15 ) & 1 );
+ dontAdvance = (FT_UShort)( ( flags >> 14 ) & 1 );
+ performAction = (FT_UShort)( ( flags >> 13 ) & 1 );
+
+ reserved = (FT_UShort)( flags & 0x1FFF );
ligActionIndex = glyphOffset.u;
if ( reserved > 0 )
diff --git a/src/gxvalid/gxvmorx5.c b/src/gxvalid/gxvmorx5.c
index ea250f3..2920f54 100644
--- a/src/gxvalid/gxvmorx5.c
+++ b/src/gxvalid/gxvmorx5.c
@@ -155,16 +155,18 @@
FT_UNUSED( state );
- setMark = FT_BOOL(( flags >> 15 ) & 1);
- dontAdvance = FT_BOOL(( flags >> 14 ) & 1);
- currentIsKashidaLike = FT_BOOL(( flags >> 13 ) & 1);
- markedIsKashidaLike = FT_BOOL(( flags >> 12 ) & 1);
- currentInsertBefore = FT_BOOL(( flags >> 11 ) & 1);
- markedInsertBefore = FT_BOOL(( flags >> 10 ) & 1);
- currentInsertCount = (FT_Byte)( (flags >> 5) & 0x1F );
- markedInsertCount = (FT_Byte)( flags & 0x001F );
- currentInsertList = (FT_Byte) ( glyphOffset.ul >> 16 );
- markedInsertList = (FT_UShort)( glyphOffset.ul );
+ setMark = FT_BOOL( ( flags >> 15 ) & 1 );
+ dontAdvance = FT_BOOL( ( flags >> 14 ) & 1 );
+ currentIsKashidaLike = FT_BOOL( ( flags >> 13 ) & 1 );
+ markedIsKashidaLike = FT_BOOL( ( flags >> 12 ) & 1 );
+ currentInsertBefore = FT_BOOL( ( flags >> 11 ) & 1 );
+ markedInsertBefore = FT_BOOL( ( flags >> 10 ) & 1 );
+
+ currentInsertCount = (FT_Byte)( ( flags >> 5 ) & 0x1F );
+ markedInsertCount = (FT_Byte)( flags & 0x001F );
+
+ currentInsertList = (FT_Byte) ( glyphOffset.ul >> 16 );
+ markedInsertList = (FT_UShort)( glyphOffset.ul );
if ( currentInsertList && 0 != currentInsertCount )
gxv_morx_subtable_type5_InsertList_validate( currentInsertList,
diff --git a/src/gxvalid/gxvopbd.c b/src/gxvalid/gxvopbd.c
index bccc59b..8d6fe66 100644
--- a/src/gxvalid/gxvopbd.c
+++ b/src/gxvalid/gxvopbd.c
@@ -141,8 +141,9 @@
FT_UNUSED( lookuptbl_limit );
FT_UNUSED( valid );
- /* XXX: check range ? */
- value.u = (FT_UShort)(base_value.u + relative_gindex * 4 * sizeof ( FT_Short ));
+ /* XXX: check range? */
+ value.u = (FT_UShort)( base_value.u +
+ relative_gindex * 4 * sizeof ( FT_Short ) );
return value;
}
diff --git a/src/gxvalid/gxvprop.c b/src/gxvalid/gxvprop.c
index 7911d48..010eeda 100644
--- a/src/gxvalid/gxvprop.c
+++ b/src/gxvalid/gxvprop.c
@@ -117,17 +117,17 @@
char complement;
- offset = (FT_UShort)(property & GXV_PROP_COMPLEMENTARY_BRACKET_OFFSET);
+ offset = (FT_UShort)( property & GXV_PROP_COMPLEMENTARY_BRACKET_OFFSET );
if ( offset == 0 )
FT_INVALID_DATA;
- complement = (char)(offset >> 8);
+ complement = (char)( offset >> 8 );
if ( complement & 0x08 )
{
/* Top bit is set: negative */
/* Calculate the absolute offset */
- complement = (char)(( complement & 0x07 ) + 1);
+ complement = (char)( ( complement & 0x07 ) + 1 );
/* The gid for complement must be greater than 0 */
if ( glyph <= complement )
@@ -136,7 +136,7 @@
else
{
/* The gid for complement must be the face. */
- gxv_glyphid_validate( (FT_UShort)(glyph + complement), valid );
+ gxv_glyphid_validate( (FT_UShort)( glyph + complement ), valid );
}
}
else
@@ -213,8 +213,9 @@
FT_UShort offset;
GXV_LookupValueDesc value;
- /* XXX: check range ? */
- offset = (FT_UShort)(base_value.u + relative_gindex * sizeof( FT_UShort ));
+ /* XXX: check range? */
+ offset = (FT_UShort)( base_value.u +
+ relative_gindex * sizeof( FT_UShort ) );
p = valid->lookuptbl_head + offset;
limit = lookuptbl_limit;
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index 754ff00..d606cdb 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -755,22 +755,23 @@
/* */
#define cur_to_org( n, zone ) \
FT_ARRAY_COPY( (zone)->org, (zone)->cur, (n) )
+
static FT_Error
- TT_Hint_Glyph( TT_Loader loader,
- FT_Bool is_composite )
+ TT_Hint_Glyph( TT_Loader loader,
+ FT_Bool is_composite )
{
TT_GlyphZone zone = &loader->zone;
FT_Pos origin;
- FT_UNUSED(is_composite);
-
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-
FT_UInt n_ins;
+#else
+ FT_UNUSED( is_composite );
+#endif
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
n_ins = loader->glyph->control_len;
-
#endif
origin = zone->cur[zone->n_points - 4].x;
@@ -779,16 +780,16 @@
translate_array( zone->n_points, zone->cur, origin, 0 );
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-
/* save original point positioin in org */
if ( n_ins > 0 )
cur_to_org( zone->n_points, zone );
-
#endif
/* round pp2 and pp4 */
- zone->cur[zone->n_points - 3].x = FT_PIX_ROUND( zone->cur[zone->n_points - 3].x );
- zone->cur[zone->n_points - 1].y = FT_PIX_ROUND( zone->cur[zone->n_points - 1].y );
+ zone->cur[zone->n_points - 3].x =
+ FT_PIX_ROUND( zone->cur[zone->n_points - 3].x );
+ zone->cur[zone->n_points - 1].y =
+ FT_PIX_ROUND( zone->cur[zone->n_points - 1].y );
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
@@ -803,8 +804,8 @@
if ( error )
return error;
- loader->exec->is_composite = is_composite;
- loader->exec->pts = *zone;
+ loader->exec->is_composite = is_composite;
+ loader->exec->pts = *zone;
debug = !( loader->load_flags & FT_LOAD_NO_SCALE ) &&
( (TT_Size)loader->size )->debug;
@@ -842,13 +843,13 @@
static FT_Error
TT_Process_Simple_Glyph( TT_Loader loader )
{
- FT_GlyphLoader gloader = loader->gloader;
- FT_Error error = TT_Err_Ok;
+ FT_GlyphLoader gloader = loader->gloader;
+ FT_Error error = TT_Err_Ok;
FT_Outline* outline;
FT_UInt n_points;
- outline = &gloader->current.outline;
+ outline = &gloader->current.outline;
n_points = outline->n_points;
/* set phantom points */
@@ -870,9 +871,9 @@
if ( ((TT_Face)loader->face)->doblend )
{
/* Deltas apply to the unscaled data. */
- FT_Vector* deltas;
- FT_Memory memory = loader->face->memory;
- FT_UInt i;
+ FT_Vector* deltas;
+ FT_Memory memory = loader->face->memory;
+ FT_UInt i;
error = TT_Vary_Get_Glyph_Deltas( (TT_Face)(loader->face),
@@ -1006,6 +1007,7 @@
( subglyph->flags & SCALED_COMPONENT_OFFSET ) )
#endif
{
+
#if 0
/*************************************************************************/
@@ -1041,7 +1043,7 @@
FT_MulFix( subglyph->transform.xx,
subglyph->transform.xx ) +
FT_MulFix( subglyph->transform.xy,
- subglyph->transform.xy) );
+ subglyph->transform.xy ) );
FT_Fixed mac_yscale = FT_SqrtFixed(
FT_MulFix( subglyph->transform.yy,
subglyph->transform.yy ) +
@@ -1128,7 +1130,7 @@
/* TT_Load_Composite_Glyph only gives us the offset of instructions */
- /* so we read them here */
+ /* so we read them here */
if ( FT_STREAM_SEEK( loader->ins_pos ) ||
FT_READ_USHORT( n_ins ) )
return error;
@@ -1200,17 +1202,13 @@
FT_Bool opened_frame = 0;
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-
FT_Vector* deltas = NULL;
-
#endif
#ifdef FT_CONFIG_OPTION_INCREMENTAL
-
FT_StreamRec inc_stream;
FT_Data glyph_data;
FT_Bool glyph_data_loaded = 0;
-
#endif
@@ -1278,9 +1276,9 @@
left_bearing = (FT_Short)metrics.bearing_x;
advance_width = (FT_UShort)metrics.advance;
-# if 0
+#if 0
- /* GWW: Do I do the same for vertical metrics ??? */
+ /* GWW: Do I do the same for vertical metrics? */
metrics.bearing_x = 0;
metrics.bearing_y = top_bearing;
metrics.advance = advance_height;
@@ -1292,7 +1290,7 @@
top_bearing = (FT_Short)metrics.bearing_y;
advance_height = (FT_UShort)metrics.advance;
-# endif
+#endif /* 0 */
}