Commit f1c2b91e149dd24cb7ad54bcc6210ece8b076aa0
2006-01-13T14:53:28
Formatting, copyright year updates. Decorate long constants with `L' and `UL' where appropriate.
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 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274
diff --git a/ChangeLog b/ChangeLog
index 3d0c667..833b427 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
Introduce new size selection interface.
- * include/freetype/internal/ftdriver.h (struct FT_Driver_ClassRec_):
+ * include/freetype/internal/ftdriver.h (struct FT_Driver_ClassRec):
Replace `set_char_sizes' and `set_pixel_sizes' by `request_size' and
`select_size'.
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 709b8b3..8804e70 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -4,7 +4,7 @@
/* */
/* FreeType high-level API and common types (specification only). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -300,8 +300,8 @@ FT_BEGIN_HEADER
/* Windows FNT: */
/* The nominal size given in a FNT font is not reliable. Thus when */
/* the driver finds it incorrect, it sets `size' to some calculated */
- /* values and set `x_ppem' and `y_ppem' to pixel width and height */
- /* given in the font, respectively. */
+ /* values and sets `x_ppem' and `y_ppem' to the pixel width and */
+ /* height given in the font, respectively. */
/* */
/* TrueType embedded bitmaps: */
/* `size', `width', and `height' values are not contained in the */
@@ -1622,7 +1622,7 @@ FT_BEGIN_HEADER
/* FT_Init_FreeType */
/* */
/* <Description> */
- /* Initializes a new FreeType library object. The set of modules */
+ /* Initialize a new FreeType library object. The set of modules */
/* that are registered by this function is determined at build time. */
/* */
/* <Output> */
@@ -1677,7 +1677,7 @@ FT_BEGIN_HEADER
/* FT_Done_FreeType */
/* */
/* <Description> */
- /* Destroys a given FreeType library object and all of its childs, */
+ /* Destroy a given FreeType library object and all of its childs, */
/* including resources, drivers, faces, sizes, etc. */
/* */
/* <Input> */
@@ -1834,7 +1834,7 @@ FT_BEGIN_HEADER
/* FT_New_Face */
/* */
/* <Description> */
- /* Creates a new face object from a given resource and typeface index */
+ /* Create a new face object from a given resource and typeface index */
/* using a pathname to the font file. */
/* */
/* <InOut> */
@@ -1885,7 +1885,7 @@ FT_BEGIN_HEADER
/* FT_New_Memory_Face */
/* */
/* <Description> */
- /* Creates a new face object from a given resource and typeface index */
+ /* Create a new face object from a given resource and typeface index */
/* using a font file already loaded into memory. */
/* */
/* <InOut> */
@@ -1941,7 +1941,7 @@ FT_BEGIN_HEADER
/* FT_Open_Face */
/* */
/* <Description> */
- /* Opens a face object from a given resource and typeface index using */
+ /* Open a face object from a given resource and typeface index using */
/* an `FT_Open_Args' structure. If the face object doesn't exist, it */
/* is created. */
/* */
@@ -1991,7 +1991,7 @@ FT_BEGIN_HEADER
/* FT_Attach_File */
/* */
/* <Description> */
- /* `Attaches' a given font file to an existing face. This is usually */
+ /* `Attach' a given font file to an existing face. This is usually */
/* to read additional information for a single face object. For */
/* example, it is used to read the AFM files that come with Type 1 */
/* fonts in order to add kerning data and other metrics. */
@@ -2060,8 +2060,8 @@ FT_BEGIN_HEADER
/* FT_Done_Face */
/* */
/* <Description> */
- /* Discards a given face object, as well as all of its child slots */
- /* and sizes. */
+ /* Discard a given face object, as well as all of its child slots and */
+ /* sizes. */
/* */
/* <Input> */
/* face :: A handle to a target face object. */
@@ -2079,7 +2079,7 @@ FT_BEGIN_HEADER
/* FT_Select_Size */
/* */
/* <Description> */
- /* Selects a fixed size. */
+ /* Select a fixed size . */
/* */
/* <InOut> */
/* face :: A handle to a target face object. */
@@ -2102,7 +2102,7 @@ FT_BEGIN_HEADER
/* FT_Size_Request_Type */
/* */
/* <Description> */
- /* An enumeration type that lists the size request types supported. */
+ /* An enumeration type that lists the supported size request types. */
/* */
/* <Values> */
/* FT_SIZE_REQUEST_TYPE_NOMINAL :: */
@@ -2110,23 +2110,24 @@ FT_BEGIN_HEADER
/* @FT_FaceRec. */
/* */
/* FT_SIZE_REQUEST_TYPE_REAL_DIM :: */
- /* The real dimension. That is, the sum of the Ascender and */
- /* (minus of) Descender fields of @FT_FaceRec. */
+ /* The real dimension. That is, the sum of the `Ascender' and */
+ /* (minus of) `Descender' fields of @FT_FaceRec. */
/* */
/* FT_SIZE_REQUEST_TYPE_BBOX :: */
- /* The font bounding box. That is, the bbox field of @FT_FaceRec. */
+ /* The font bounding box. That is, the `bbox' field of */
+ /* @FT_FaceRec. */
/* */
/* FT_SIZE_REQUEST_TYPE_CELL :: */
- /* The horizontal scale is determined by the max_advance_width */
- /* field of @FT_FaceRec and the vertical scale is determined the */
+ /* The horizontal scale is determined by the `max_advance_width' */
+ /* field of @FT_FaceRec, and the vertical scale is determined the */
/* same way as @FT_SIZE_REQUEST_TYPE_REAL_DIM does. Finally, both */
- /* scales are set to the smaller one. This type is useful when */
- /* you want to specify the font size for, for example, a window of */
+ /* scales are set to the smaller one. This type is useful if you */
+ /* want to specify the font size for, for example, a window of */
/* 80x24 cells. */
/* */
/* <Note> */
- /* See the note section of @FT_Size_Metrics if you wonder how does */
- /* size requesting relate to scales. */
+ /* See the note section of @FT_Size_Metrics if you wonder how size */
+ /* requesting relates to scales. */
/* */
typedef enum FT_Size_Request_Type_
{
@@ -2153,19 +2154,19 @@ FT_BEGIN_HEADER
/* */
/* height :: The desired height. */
/* */
- /* horiResolution :: The horizontal resolution. If set to zero, then */
- /* the width is treated as 26.6 fractional pixels. */
+ /* horiResolution :: The horizontal resolution. If set to zero, the */
+ /* width is treated as 26.6 fractional pixels. */
/* */
- /* vertResolution :: The vertical resolution. If set to zero, then */
- /* the height is treated as 26.6 fractional pixels. */
+ /* vertResolution :: The vertical resolution. If set to zero, the */
+ /* height is treated as 26.6 fractional pixels. */
/* */
/* <Note> */
- /* width and height cannot both be zero. If either of them is zero, */
- /* its value is chosen so that the horizontal and vertical scales are */
- /* equal. */
+ /* `width' and `height' cannot both be zero. If either of them is */
+ /* zero, its value is chosen so that the horizontal and vertical */
+ /* scales are equal. */
/* */
- /* You should use @FT_Select_Size if you are intended to select some */
- /* fixed size from the `available_sizes' field of @FT_FaceRec. */
+ /* You should use @FT_Select_Size if you intend to select some fixed */
+ /* size from the `available_sizes' field of @FT_FaceRec. */
/* */
typedef struct FT_Size_RequestRec_
{
@@ -2174,6 +2175,7 @@ FT_BEGIN_HEADER
FT_F26Dot6 height;
FT_UInt horiResolution;
FT_UInt vertResolution;
+
} FT_Size_RequestRec, *FT_Size_Request;
@@ -2186,10 +2188,10 @@ FT_BEGIN_HEADER
/* Request the size of the active size object of a given face object. */
/* */
/* <InOut> */
- /* face :: A handle to a target face object. */
+ /* face :: A handle to a target face object. */
/* */
/* <Input> */
- /* req :: A pointer to a @FT_Size_RequestRec. */
+ /* req :: A pointer to a @FT_Size_RequestRec. */
/* */
/* <Return> */
/* FreeType error code. 0 means success. */
@@ -2709,9 +2711,8 @@ FT_BEGIN_HEADER
/* FT_Render_Glyph */
/* */
/* <Description> */
- /* Converts a given glyph image to a bitmap. It does so by */
- /* inspecting the glyph image format, find the relevant renderer, and */
- /* invoke it. */
+ /* Convert a given glyph image to a bitmap. It does so by inspecting */
+ /* the glyph image format, find the relevant renderer, and invoke it. */
/* */
/* <InOut> */
/* slot :: A handle to the glyph slot containing the image to */
@@ -2800,7 +2801,7 @@ FT_BEGIN_HEADER
/* FT_Get_Kerning */
/* */
/* <Description> */
- /* Returns the kerning vector between two glyphs of a same face. */
+ /* Return the kerning vector between two glyphs of a same face. */
/* */
/* <Input> */
/* face :: A handle to a source face object. */
@@ -2841,7 +2842,7 @@ FT_BEGIN_HEADER
/* FT_Get_Glyph_Name */
/* */
/* <Description> */
- /* Retrieves the ASCII name of a given glyph in a face. This only */
+ /* Retriev the ASCII name of a given glyph in a face. This only */
/* works for those faces where @FT_HAS_GLYPH_NAMES(face) returns */
/* TRUE. */
/* */
@@ -2885,7 +2886,7 @@ FT_BEGIN_HEADER
/* FT_Get_Postscript_Name */
/* */
/* <Description> */
- /* Retrieves the ASCII Postscript name of a given face, if available. */
+ /* Retriev the ASCII Postscript name of a given face, if available. */
/* This only works with Postscript and TrueType fonts. */
/* */
/* <Input> */
@@ -2908,7 +2909,7 @@ FT_BEGIN_HEADER
/* FT_Select_Charmap */
/* */
/* <Description> */
- /* Selects a given charmap by its encoding tag (as listed in */
+ /* Select a given charmap by its encoding tag (as listed in */
/* `freetype.h'). */
/* */
/* <InOut> */
@@ -2935,8 +2936,7 @@ FT_BEGIN_HEADER
/* FT_Set_Charmap */
/* */
/* <Description> */
- /* Selects a given charmap for character code to glyph index */
- /* decoding. */
+ /* Select a given charmap for character code to glyph index decoding. */
/* */
/* <InOut> */
/* face :: A handle to the source face object. */
@@ -2984,7 +2984,7 @@ FT_BEGIN_HEADER
/* FT_Get_Char_Index */
/* */
/* <Description> */
- /* Returns the glyph index of a given character code. This function */
+ /* Return the glyph index of a given character code. This function */
/* uses a charmap object to do the translation. */
/* */
/* <Input> */
@@ -3095,7 +3095,7 @@ FT_BEGIN_HEADER
/* FT_Get_Name_Index */
/* */
/* <Description> */
- /* Returns the glyph index of a given glyph name. This function uses */
+ /* Return the glyph index of a given glyph name. This function uses */
/* driver specific objects to do the translation. */
/* */
/* <Input> */
@@ -3294,7 +3294,7 @@ FT_BEGIN_HEADER
/* FT_Vector_Transform */
/* */
/* <Description> */
- /* Transforms a single vector through a 2x2 matrix. */
+ /* Transform a single vector through a 2x2 matrix. */
/* */
/* <InOut> */
/* vector :: The target vector to transform. */
diff --git a/include/freetype/internal/ftdriver.h b/include/freetype/internal/ftdriver.h
index 62fc701..a981b6d 100644
--- a/include/freetype/internal/ftdriver.h
+++ b/include/freetype/internal/ftdriver.h
@@ -4,7 +4,7 @@
/* */
/* FreeType font driver interface (specification). */
/* */
-/* Copyright 1996-2001, 2002, 2003 by */
+/* Copyright 1996-2001, 2002, 2003, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -130,7 +130,7 @@ FT_BEGIN_HEADER
/* scaling done in the base layer suffices. */
/* */
/* select_size :: A handle to a function used to select a new */
- /* fixed size. It is used only when */
+ /* fixed size. It is used only if */
/* @FT_FACE_FLAG_FIXED_SIZES is set. Can be set */
/* to 0 if the scaling done in the base layer */
/* suffices. */
diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index 1142dfd..0a6c316 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -4,7 +4,7 @@
/* */
/* The FreeType private base classes (specification). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/include/freetype/internal/sfnt.h b/include/freetype/internal/sfnt.h
index b622270..808dd98 100644
--- a/include/freetype/internal/sfnt.h
+++ b/include/freetype/internal/sfnt.h
@@ -4,7 +4,7 @@
/* */
/* High-level `sfnt' driver interface (specification). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -131,7 +131,7 @@ FT_BEGIN_HEADER
/* TT_Load_SFNT_HeaderRec_Func */
/* */
/* <Description> */
- /* Loads the header of a SFNT font file. Supports collections. */
+ /* Load the header of a SFNT font file. Supports collections. */
/* */
/* <Input> */
/* face :: A handle to the target face object. */
@@ -169,7 +169,7 @@ FT_BEGIN_HEADER
/* TT_Load_Directory_Func */
/* */
/* <Description> */
- /* Loads the table directory into a face object. */
+ /* Load the table directory into a face object. */
/* */
/* <Input> */
/* face :: A handle to the target face object. */
@@ -198,7 +198,7 @@ FT_BEGIN_HEADER
/* TT_Load_Any_Func */
/* */
/* <Description> */
- /* Loads any font table into client memory. */
+ /* Load any font table into client memory. */
/* */
/* <Input> */
/* face :: The face object to look for. */
@@ -246,7 +246,7 @@ FT_BEGIN_HEADER
/* TT_Find_SBit_Image_Func */
/* */
/* <Description> */
- /* Checks whether an embedded bitmap (an `sbit') exists for a given */
+ /* Check whether an embedded bitmap (an `sbit') exists for a given */
/* glyph, at a given strike. */
/* */
/* <Input> */
@@ -283,7 +283,7 @@ FT_BEGIN_HEADER
/* TT_Load_SBit_Metrics_Func */
/* */
/* <Description> */
- /* Gets the big metrics for a given embedded bitmap. */
+ /* Get the big metrics for a given embedded bitmap. */
/* */
/* <Input> */
/* stream :: The input stream. */
@@ -316,7 +316,7 @@ FT_BEGIN_HEADER
/* TT_Load_SBit_Image_Func */
/* */
/* <Description> */
- /* Loads a given glyph sbit image from the font resource. This also */
+ /* Load a given glyph sbit image from the font resource. This also */
/* returns its metrics. */
/* */
/* <Input> */
@@ -365,7 +365,7 @@ FT_BEGIN_HEADER
/* TT_Set_SBit_Strike_Func */
/* */
/* <Description> */
- /* Selects an sbit strike for a given size request. */
+ /* Select an sbit strike for a given size request. */
/* */
/* <Input> */
/* face :: The target face object. */
@@ -391,7 +391,7 @@ FT_BEGIN_HEADER
/* TT_Load_Strike_Metrics_Func */
/* */
/* <Description> */
- /* Loads the metrics of a given strike. */
+ /* Load the metrics of a given strike. */
/* */
/* <Input> */
/* face :: The target face object. */
@@ -417,7 +417,7 @@ FT_BEGIN_HEADER
/* TT_Get_PS_Name_Func */
/* */
/* <Description> */
- /* Gets the PostScript glyph name of a glyph. */
+ /* Get the PostScript glyph name of a glyph. */
/* */
/* <Input> */
/* idx :: The glyph index. */
@@ -442,7 +442,7 @@ FT_BEGIN_HEADER
/* TT_Load_Metrics_Func */
/* */
/* <Description> */
- /* Loads the horizontal or vertical header in a face object. */
+ /* Load the horizontal or vertical header in a face object. */
/* */
/* <Input> */
/* face :: A handle to the target face object. */
@@ -466,7 +466,7 @@ FT_BEGIN_HEADER
/* TT_Load_Table_Func */
/* */
/* <Description> */
- /* Loads a given TrueType table. */
+ /* Load a given TrueType table. */
/* */
/* <Input> */
/* face :: A handle to the target face object. */
@@ -491,7 +491,7 @@ FT_BEGIN_HEADER
/* TT_Free_Table_Func */
/* */
/* <Description> */
- /* Frees a given TrueType table. */
+ /* Free a given TrueType table. */
/* */
/* <Input> */
/* face :: A handle to the target face object. */
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 6511302..a19092c 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -1980,7 +1980,7 @@
return FT_Err_Unimplemented_Feature;
if ( req->horiResolution )
- w = ( req->width * req->horiResolution + 36 ) / 72;
+ w = ( req->width * req->horiResolution + 36 ) / 72;
else
w = req->width;
@@ -2000,7 +2000,7 @@
continue;
if ( w == face->available_sizes[i].x_ppem ||
- ignore_width )
+ ignore_width )
{
if ( index )
*index = (FT_ULong)i;
@@ -2069,8 +2069,8 @@
}
else
{
- metrics->x_scale = 0x10000;
- metrics->y_scale = 0x10000;
+ metrics->x_scale = 0x10000L;
+ metrics->y_scale = 0x10000L;
metrics->ascender = bsize->y_ppem;
metrics->descender = 0;
metrics->height = bsize->height << 6;
@@ -2114,24 +2114,28 @@
case FT_SIZE_REQUEST_TYPE_NOMINAL:
w = h = face->units_per_EM;
break;
+
case FT_SIZE_REQUEST_TYPE_REAL_DIM:
w = h = face->ascender - face->descender;
break;
+
case FT_SIZE_REQUEST_TYPE_CELL:
w = face->max_advance_width;
h = face->ascender - face->descender;
break;
+
case FT_SIZE_REQUEST_TYPE_BBOX:
w = face->bbox.xMax - face->bbox.xMin;
h = face->bbox.yMax - face->bbox.yMin;
break;
+
default:
return FT_Err_Unimplemented_Feature;
break;
}
if ( req->horiResolution )
- scaled_w = ( req->width * req->horiResolution + 36 ) / 72;
+ scaled_w = ( req->width * req->horiResolution + 36 ) / 72;
else
scaled_w = req->width;
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
index 4be2411..445fb9f 100644
--- a/src/bdf/bdfdrivr.c
+++ b/src/bdf/bdfdrivr.c
@@ -2,7 +2,7 @@
FreeType font driver for bdf files
- Copyright (C) 2001, 2002, 2003, 2004, 2005 by
+ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by
Francesco Zappa Nardelli
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -587,9 +587,9 @@ THE SOFTWARE.
{
bdf_font_t* bdffont = ( (BDF_Face)size->face )->bdffont;
-
FT_UNUSED( index );
+
size->metrics.ascender = bdffont->font_ascent << 6;
size->metrics.descender = -bdffont->font_descent << 6;
size->metrics.max_advance = bdffont->bbx.width << 6;
diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c
index 31100ed..8d43746 100644
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -1,6 +1,6 @@
/*
* Copyright 2000 Computing Research Labs, New Mexico State University
- * Copyright 2001, 2002, 2003, 2004, 2005 Francesco Zappa Nardelli
+ * Copyright 2001, 2002, 2003, 2004, 2005, 2006 Francesco Zappa Nardelli
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -1064,8 +1064,8 @@
_BDF_BBX | \
_BDF_BITMAP )
-#define _BDF_GLYPH_WIDTH_CHECK 0x40000000L
-#define _BDF_GLYPH_HEIGHT_CHECK 0x80000000L
+#define _BDF_GLYPH_WIDTH_CHECK 0x40000000UL
+#define _BDF_GLYPH_HEIGHT_CHECK 0x80000000UL
/* Auto correction messages. */
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index dd32e39..3b09499 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -4,7 +4,7 @@
/* */
/* OpenType font driver implementation (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 91eb60a..2f9c612 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -4,7 +4,7 @@
/* */
/* OpenType Glyph Loader (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -2420,7 +2420,7 @@
FT_Stream stream = cff_face->root.stream;
- if ( size->strike_index != 0xFFFFFFFFU &&
+ if ( size->strike_index != 0xFFFFFFFFUL &&
sfnt->load_sbits &&
( load_flags & FT_LOAD_NO_BITMAP ) == 0 )
{
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index b94d60d..504f098 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -4,7 +4,7 @@
/* */
/* OpenType objects manager (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -159,7 +159,7 @@
cffsize->internal = (FT_Size_Internal)(void*)globals;
}
- size->strike_index = 0xFFFFFFFFU;
+ size->strike_index = 0xFFFFFFFFUL;
return error;
}
@@ -171,8 +171,12 @@
{
CFF_Size cffsize = (CFF_Size)size;
PSH_Globals_Funcs funcs;
+
+#ifndef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
+
+ FT_UNUSED( req );
-#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
+#else
if ( FT_HAS_FIXED_SIZES( size->face ) )
{
@@ -183,20 +187,16 @@
FT_Error error;
- if ( !( error = sfnt->set_sbit_strike( cffface,
- req,
- &index ) ) &&
- !( error = sfnt->load_strike_metrics( cffface,
- index,
- metrics ) ) )
+ if ( !( error = sfnt->set_sbit_strike(
+ cffface, req, &index ) ) &&
+ !( error = sfnt->load_strike_metrics(
+ cffface, index, metrics ) ) )
cffsize->strike_index = index;
else
- cffsize->strike_index = 0xFFFFFFFFU;
+ cffsize->strike_index = 0xFFFFFFFFUL;
}
-#endif
-
- FT_UNUSED( req );
+#endif /* TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
funcs = cff_size_get_globals_funcs( cffsize );
@@ -234,7 +234,7 @@
error = sfnt->load_strike_metrics( cffface, index, metrics );
if ( error )
- cffsize->strike_index = 0xFFFFFFFFU;
+ cffsize->strike_index = 0xFFFFFFFFUL;
else
cffsize->strike_index = index;
diff --git a/src/cff/cffobjs.h b/src/cff/cffobjs.h
index 904e36a..3377520 100644
--- a/src/cff/cffobjs.h
+++ b/src/cff/cffobjs.h
@@ -4,7 +4,7 @@
/* */
/* OpenType objects manager (specification). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -54,7 +54,7 @@ FT_BEGIN_HEADER
typedef struct CFF_SizeRec_
{
FT_SizeRec root;
- FT_ULong strike_index; /* 0xFFFFFFFFU to indicate invalid */
+ FT_ULong strike_index; /* 0xFFFFFFFF to indicate invalid */
} CFF_SizeRec, *CFF_Size;
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
index e1a91d7..20ca1e0 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -4,7 +4,7 @@
/* */
/* CID objects manager (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -158,9 +158,9 @@
{
PSH_Globals_Funcs funcs;
-
FT_UNUSED( req );
+
funcs = cid_size_get_globals_funcs( (CID_Size)size );
if ( funcs )
diff --git a/src/cid/cidobjs.h b/src/cid/cidobjs.h
index 05fbaef..aee346d 100644
--- a/src/cid/cidobjs.h
+++ b/src/cid/cidobjs.h
@@ -4,7 +4,7 @@
/* */
/* CID objects manager (specification). */
/* */
-/* Copyright 1996-2001, 2002, 2004 by */
+/* Copyright 1996-2001, 2002, 2004, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c
index 9b8774c..01378d5 100644
--- a/src/cid/cidriver.c
+++ b/src/cid/cidriver.c
@@ -4,7 +4,7 @@
/* */
/* CID driver interface (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h
index 64acefc..9d2d8e0 100644
--- a/src/pcf/pcf.h
+++ b/src/pcf/pcf.h
@@ -2,7 +2,7 @@
FreeType font driver for pcf fonts
- Copyright (C) 2000, 2001, 2002, 2003 by
+ Copyright (C) 2000, 2001, 2002, 2003, 2006 by
Francesco Zappa Nardelli
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -171,12 +171,12 @@ FT_BEGIN_HEADER
#define PCF_FILE_VERSION ( ( 'p' << 24 ) | \
( 'c' << 16 ) | \
( 'f' << 8 ) | 1 )
-#define PCF_FORMAT_MASK 0xFFFFFF00L
+#define PCF_FORMAT_MASK 0xFFFFFF00UL
-#define PCF_DEFAULT_FORMAT 0x00000000L
-#define PCF_INKBOUNDS 0x00000200L
-#define PCF_ACCEL_W_INKBOUNDS 0x00000100L
-#define PCF_COMPRESSED_METRICS 0x00000100L
+#define PCF_DEFAULT_FORMAT 0x00000000UL
+#define PCF_INKBOUNDS 0x00000200UL
+#define PCF_ACCEL_W_INKBOUNDS 0x00000100UL
+#define PCF_COMPRESSED_METRICS 0x00000100UL
#define PCF_FORMAT_MATCH( a, b ) \
( ( (a) & PCF_FORMAT_MASK ) == ( (b) & PCF_FORMAT_MASK ) )
diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
index f017381..011b45d 100644
--- a/src/pcf/pcfdrivr.c
+++ b/src/pcf/pcfdrivr.c
@@ -2,7 +2,7 @@
FreeType font driver for pcf files
- Copyright (C) 2000, 2001, 2002, 2003, 2004 by
+ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006 by
Francesco Zappa Nardelli
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -366,11 +366,11 @@ THE SOFTWARE.
PCF_Size_Select( FT_Size size,
FT_ULong index )
{
- PCF_Face face = (PCF_Face)size->face;
-
+ PCF_Face face = (PCF_Face)size->face;
FT_UNUSED( index );
+
size->metrics.ascender = face->accel.fontAscent << 6;
size->metrics.descender = -face->accel.fontDescent << 6;
#if 0
diff --git a/src/pfr/pfrdrivr.c b/src/pfr/pfrdrivr.c
index ae8e353..2183a69 100644
--- a/src/pfr/pfrdrivr.c
+++ b/src/pfr/pfrdrivr.c
@@ -4,7 +4,7 @@
/* */
/* FreeType PFR driver interface (body). */
/* */
-/* Copyright 2002, 2003, 2004 by */
+/* Copyright 2002, 2003, 2004, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/pfr/pfrobjs.c b/src/pfr/pfrobjs.c
index 3cadd5c..b4b89e5 100644
--- a/src/pfr/pfrobjs.c
+++ b/src/pfr/pfrobjs.c
@@ -4,7 +4,7 @@
/* */
/* FreeType PFR object methods (body). */
/* */
-/* Copyright 2002, 2003, 2004, 2005 by */
+/* Copyright 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index b61ba15..12529a2 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -4,7 +4,7 @@
/* */
/* High-level SFNT driver interface (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c
index 89bc8bb..4589160 100644
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -4,7 +4,7 @@
/* */
/* TrueType and OpenType embedded bitmap support (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/sfnt/ttsbit.h b/src/sfnt/ttsbit.h
index c5cb60d..cfb5fb5 100644
--- a/src/sfnt/ttsbit.h
+++ b/src/sfnt/ttsbit.h
@@ -4,7 +4,7 @@
/* */
/* TrueType and OpenType embedded bitmap support (specification). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/sfnt/ttsbit0.c b/src/sfnt/ttsbit0.c
index b2fa183..8645f37 100644
--- a/src/sfnt/ttsbit0.c
+++ b/src/sfnt/ttsbit0.c
@@ -5,7 +5,7 @@
/* TrueType and OpenType embedded bitmap support (body). */
/* This is a heap-optimized version. */
/* */
-/* Copyright 2005 by */
+/* Copyright 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -219,7 +219,7 @@
FT_ULong strike_index,
FT_Size_Metrics* metrics )
{
- FT_Byte* strike;
+ FT_Byte* strike;
if ( strike_index >= (FT_ULong)face->num_sbit_strikes )
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index 94d9a82..580804f 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -4,7 +4,7 @@
/* */
/* TrueType font driver implementation (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -142,7 +142,11 @@
TT_Size ttsize = (TT_Size)size;
FT_Error error = TT_Err_Ok;
-#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
+#ifndef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
+
+ FT_UNUSED( req );
+
+#else
if ( FT_HAS_FIXED_SIZES( size->face ) )
{
@@ -150,18 +154,17 @@
FT_Size_Metrics* metrics = &size->metrics;
FT_ULong index;
- if ( !( error = sfnt->set_sbit_strike( ttface,
- req,
- &index ) ) &&
- !( error = sfnt->load_strike_metrics( ttface,
- index,
- metrics ) ) )
+
+ if ( !( error = sfnt->set_sbit_strike(
+ ttface, req, &index ) ) &&
+ !( error = sfnt->load_strike_metrics(
+ ttface, index, metrics ) ) )
ttsize->strike_index = index;
else
- ttsize->strike_index = 0xFFFFFFFFU;
+ ttsize->strike_index = 0xFFFFFFFFUL;
}
-#endif
+#endif /* TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
if ( FT_IS_SCALABLE( size->face ) )
error = tt_size_reset( ttsize );
@@ -188,7 +191,7 @@
error = sfnt->load_strike_metrics( ttface, index, metrics );
if ( error )
- ttsize->strike_index = 0xFFFFFFFFU;
+ ttsize->strike_index = 0xFFFFFFFFUL;
else
ttsize->strike_index = index;
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index 4744433..6701471 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -4,7 +4,7 @@
/* */
/* TrueType Glyph Loader (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -2007,7 +2007,7 @@
/* */
/* XXX: The convention should be emphasized in */
/* the documents because it can be confusing. */
- if ( size->strike_index != 0xFFFFFFFFU &&
+ if ( size->strike_index != 0xFFFFFFFFUL &&
( load_flags & FT_LOAD_NO_BITMAP ) == 0 )
{
error = load_sbit_image( size, glyph, glyph_index, load_flags );
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index 391e26c..d94d56e 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -4,7 +4,7 @@
/* */
/* Objects manager (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -66,7 +66,7 @@
/* tt_glyphzone_done */
/* */
/* <Description> */
- /* Deallocates a glyph zone. */
+ /* Deallocate a glyph zone. */
/* */
/* <Input> */
/* zone :: A pointer to the target glyph zone. */
@@ -97,7 +97,7 @@
/* tt_glyphzone_new */
/* */
/* <Description> */
- /* Allocates a new glyph zone. */
+ /* Allocate a new glyph zone. */
/* */
/* <Input> */
/* memory :: A handle to the current memory object. */
@@ -148,7 +148,7 @@
/* tt_face_init */
/* */
/* <Description> */
- /* Initializes a given TrueType face object. */
+ /* Initialize a given TrueType face object. */
/* */
/* <Input> */
/* stream :: The source font stream. */
@@ -276,7 +276,7 @@
/* tt_face_done */
/* */
/* <Description> */
- /* Finalizes a given face object. */
+ /* Finalize a given face object. */
/* */
/* <Input> */
/* face :: A pointer to the face object to destroy. */
@@ -483,7 +483,7 @@
/* tt_size_init */
/* */
/* <Description> */
- /* Initializes a new TrueType size object. */
+ /* Initialize a new TrueType size object. */
/* */
/* <InOut> */
/* size :: A handle to the size object. */
@@ -585,7 +585,7 @@
#endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
size->ttmetrics.valid = FALSE;
- size->strike_index = 0xFFFFFFFFU;
+ size->strike_index = 0xFFFFFFFFUL;
return error;
}
@@ -652,7 +652,7 @@
/* tt_size_reset */
/* */
/* <Description> */
- /* Resets a TrueType size when resolutions and character dimensions */
+ /* Reset a TrueType size when resolutions and character dimensions */
/* have been changed. */
/* */
/* <Input> */
@@ -678,10 +678,10 @@
if ( metrics->x_ppem < 1 || metrics->y_ppem < 1 )
return TT_Err_Invalid_PPem;
- /* This bit flag, when set, indicates that the ppems must be */
- /* rounded to integer. Nearly all TrueType fonts have this bit */
- /* set, as hinting won't work really well otherwise. */
- /* */
+ /* This bit flag, if set, indicates that the ppems must be */
+ /* rounded to integers. Nearly all TrueType fonts have this bit */
+ /* set, as hinting won't work really well otherwise. */
+ /* */
if ( face->header.Flags & 8 )
{
metrics->x_scale = FT_DivFix( metrics->x_ppem << 6,
@@ -765,7 +765,7 @@
/* tt_driver_init */
/* */
/* <Description> */
- /* Initializes a given TrueType driver object. */
+ /* Initialize a given TrueType driver object. */
/* */
/* <Input> */
/* driver :: A handle to the target driver object. */
@@ -801,7 +801,7 @@
/* tt_driver_done */
/* */
/* <Description> */
- /* Finalizes a given TrueType driver. */
+ /* Finalize a given TrueType driver. */
/* */
/* <Input> */
/* driver :: A handle to the target TrueType driver. */
@@ -832,7 +832,7 @@
/* tt_slot_init */
/* */
/* <Description> */
- /* Initializes a new slot object. */
+ /* Initialize a new slot object. */
/* */
/* <InOut> */
/* slot :: A handle to the slot object. */
diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h
index c140439..b42b735 100644
--- a/src/truetype/ttobjs.h
+++ b/src/truetype/ttobjs.h
@@ -4,7 +4,7 @@
/* */
/* Objects manager (specification). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -322,7 +322,7 @@ FT_BEGIN_HEADER
TT_Size_Metrics ttmetrics;
- FT_ULong strike_index; /* 0xFFFFFFFFU to indicate invalid */
+ FT_ULong strike_index; /* 0xFFFFFFFF to indicate invalid */
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c
index b9c83e1..72b25f3 100644
--- a/src/truetype/ttpload.c
+++ b/src/truetype/ttpload.c
@@ -4,7 +4,7 @@
/* */
/* TrueType glyph data/program tables loader (body). */
/* */
-/* Copyright 1996-2001, 2002, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -83,7 +83,7 @@
if ( face->header.Index_To_Loc_Format != 0 )
{
- if ( table_len >= 0x40000 )
+ if ( table_len >= 0x40000L )
{
FT_TRACE2(( "table too large!\n" ));
error = TT_Err_Invalid_Table;
@@ -93,7 +93,7 @@
}
else
{
- if ( table_len >= 0x20000 )
+ if ( table_len >= 0x20000L )
{
FT_TRACE2(( "table too large!\n" ));
error = TT_Err_Invalid_Table;
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c
index ecaf4c0..1ca8a0c 100644
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -4,7 +4,7 @@
/* */
/* Type 1 driver interface (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index 2080a76..6af5279 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -4,7 +4,7 @@
/* */
/* Type 1 font loader (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -335,8 +335,8 @@
mmvar->axis[i].def = ( mmvar->axis[i].minimum +
mmvar->axis[i].maximum ) / 2;
/* Does not apply. But this value is in range */
- mmvar->axis[i].strid = 0xFFFFFFFFLU; /* Does not apply */
- mmvar->axis[i].tag = 0xFFFFFFFFLU; /* Does not apply */
+ mmvar->axis[i].strid = 0xFFFFFFFFUL; /* Does not apply */
+ mmvar->axis[i].tag = 0xFFFFFFFFUL; /* Does not apply */
if ( ft_strcmp( mmvar->axis[i].name, "Weight" ) == 0 )
mmvar->axis[i].tag = FT_MAKE_TAG( 'w', 'g', 'h', 't' );
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index 794d392..4cd460d 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -4,7 +4,7 @@
/* */
/* Type 1 objects manager (body). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/type1/t1objs.h b/src/type1/t1objs.h
index 81a4b5f..6449e1e 100644
--- a/src/type1/t1objs.h
+++ b/src/type1/t1objs.h
@@ -4,7 +4,7 @@
/* */
/* Type 1 objects manager (specification). */
/* */
-/* Copyright 1996-2001, 2002 by */
+/* Copyright 1996-2001, 2002, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/src/type42/t42drivr.c b/src/type42/t42drivr.c
index 79614ba..b293e18 100644
--- a/src/type42/t42drivr.c
+++ b/src/type42/t42drivr.c
@@ -4,7 +4,7 @@
/* */
/* High-level Type 42 driver interface (body). */
/* */
-/* Copyright 2002, 2003, 2004 by Roberto Alameda. */
+/* Copyright 2002, 2003, 2004, 2006 by Roberto Alameda. */
/* */
/* This file is part of the FreeType project, and may only be used, */
/* modified, and distributed under the terms of the FreeType project */
diff --git a/src/type42/t42objs.c b/src/type42/t42objs.c
index 1aa8429..c9d0fc8 100644
--- a/src/type42/t42objs.c
+++ b/src/type42/t42objs.c
@@ -4,7 +4,7 @@
/* */
/* Type 42 objects manager (body). */
/* */
-/* Copyright 2002, 2003, 2004, 2005 by Roberto Alameda. */
+/* Copyright 2002, 2003, 2004, 2005, 2006 by Roberto Alameda. */
/* */
/* This file is part of the FreeType project, and may only be used, */
/* modified, and distributed under the terms of the FreeType project */
@@ -493,7 +493,7 @@
T42_Size_Request( T42_Size size,
FT_Size_Request req )
{
- T42_Face face = (T42_Face)size->root.face;
+ T42_Face face = (T42_Face)size->root.face;
FT_Activate_Size( size->ttsize );
@@ -506,7 +506,7 @@
T42_Size_Select( T42_Size size,
FT_ULong index )
{
- T42_Face face = (T42_Face)size->root.face;
+ T42_Face face = (T42_Face)size->root.face;
FT_Activate_Size( size->ttsize );
diff --git a/src/type42/t42objs.h b/src/type42/t42objs.h
index c893bb4..aff2675 100644
--- a/src/type42/t42objs.h
+++ b/src/type42/t42objs.h
@@ -4,7 +4,7 @@
/* */
/* Type 42 objects manager (specification). */
/* */
-/* Copyright 2002, 2003 by Roberto Alameda. */
+/* Copyright 2002, 2003, 2006 by Roberto Alameda. */
/* */
/* This file is part of the FreeType project, and may only be used, */
/* modified, and distributed under the terms of the FreeType project */
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 0847a8f..a24ea1b 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -4,7 +4,7 @@
/* */
/* FreeType font driver for Windows FNT/FON files */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -592,6 +592,7 @@
FT_Face face = size->face;
FT_Error error;
+
error = FT_Match_Size( face, req, 1, NULL );
if ( error )