Commit 521a2d7a13afd210283a8e071b44a881ed9bc38f
2001-03-20T22:58:56
* builds/win32/detekt.mk: Fix .PHONY target for Intel compiler. Renamed "ftnames.h" to "ftsnames.h", and FT_NAMES_H to FT_SFNT_NAMES_H. * docs/docmaker.py: Added generation of INDEX link in table of contents. * INSTALL, docs/BUILD: Updated documentation to indicate that the compilation process has changed slightly (no more `src' required in * builds/*/*-def.mk: Changed the objects directory from "obj" to "objs". * include/freetype/config/ftheader.h: Removed obsolete macros like FT_SOURCE_FILE, etc. and added cache-specific macro definitions that were previously defined in <freetype/ftcache.h>. Added comments to be included in a new API Reference section. * src/*/*: Removed the use of FT_SOURCE_FILE, etc. Now, each component needs to add its own directory to the include path at compile time. Modified all "rules.mk" and "descrip.mms" accordingly. * src/cid/cidobjs.c, src/cid/cidload.c, src/pcf/pcfread.c, src/type1/t1load.c, src/type1/t1objs.c: Added a few casts to remove compiler warnings in pedantic modes. * include/config/ft2build.h, include/config/ftheader.h: The file top-level <ft2build.h>. * include/config/ftheader.h: Added new section describing the #include macros. the Type 2 glyph charstring (used by conversion programs). * docs/docmaker.py: Added cross-references generation as well as seac emulation provided by the Type 2 endchar operator. * src/cid/cidafm.c, src/cid/cidafm.h: removed un-needed files, Added support for clipped direct rendering in the smooth renderer. * src/cff/t2objs.c (T2_Init_Face): For pure CFF fonts, set
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
diff --git a/ChangeLog b/ChangeLog
index a960b28..1b1759f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,25 +1,32 @@
-2001-03-20 David Turner <david.turner@freetype.org>
+2001-03-20 Werner Lemberg <wl@gnu.org>
+
+ * builds/win32/detekt.mk: Fix .PHONY target for Intel compiler.
+
+2001-03-20 David Turner <david.turner@freetype.org>
* include/freetype/config/ftheader.h, include/freetype/ftsnames.h:
- renamed "ftnames.h" to "ftsnames.h", and FT_NAMES_H to FT_SFNT_NAMES_H
+ Renamed "ftnames.h" to "ftsnames.h", and FT_NAMES_H to
+ FT_SFNT_NAMES_H.
- * docs/docmaker.py: added generation of INDEX link in table of contents
+ * docs/docmaker.py: Added generation of INDEX link in table of
+ contents.
- * INSTALL, docs/BUILD: updated documentation to indicate that the
- compilation process has changed slightly (no more 'src' required in
+ * INSTALL, docs/BUILD: Updated documentation to indicate that the
+ compilation process has changed slightly (no more `src' required in
the include path).
- * builds/*/*-def.mk: changed the objects directory from "obj" to "objs"
-
- * include/freetype/config/ftheader.h: removed obsolete macros like
- FT_SOURCE_FILE, etc.. and added cache-specific macro definitions that
- were previously defined in <freetype/ftcache.h>. Added comments to be
- included in a new API Reference section.
+ * builds/*/*-def.mk: Changed the objects directory from "obj" to
+ "objs".
- * src/*/*: removed the use of FT_SOURCE_FILE, etc.. now, each component
- needs to added its own directory to the include path at compile time.
- Modified all "rules.mk" and "descrip.mms" accordingly..
+ * include/freetype/config/ftheader.h: Removed obsolete macros like
+ FT_SOURCE_FILE, etc. and added cache-specific macro definitions that
+ were previously defined in <freetype/ftcache.h>. Added comments to
+ be included in a new API Reference section.
+ * src/*/*: Removed the use of FT_SOURCE_FILE, etc. Now, each
+ component needs to add its own directory to the include path at
+ compile time. Modified all "rules.mk" and "descrip.mms"
+ accordingly.
2001-03-20 Werner Lemberg <wl@gnu.org>
@@ -36,19 +43,19 @@
* src/cff/cffparse.c (cff_parse_font_bbox): Assign the units per em
value an unsigned short value, first by shifting right 16 bits,
then by casting the results to FT_UShort.
-
+
2001-03-17 David Turner <david.turner@freetype.org>
- * src/cid/cidobjs.c, src/cid/cidload.c, src/pcf/pcfread.c,
- src/type1/t1load.c, src/type1/t1objs.c: added a few casts to remove
- compiler warnings in pedantic modes..
+ * src/cid/cidobjs.c, src/cid/cidload.c, src/pcf/pcfread.c,
+ src/type1/t1load.c, src/type1/t1objs.c: Added a few casts to remove
+ compiler warnings in pedantic modes.
- * include/config/ft2build.h, include/config/ftheader.h: the file
+ * include/config/ft2build.h, include/config/ftheader.h: The file
"ft2build.h" was renamed to "ftheader.h" to avoid conflicts with the
- top-level <ft2build.h>
-
- * include/config/ftheader.h: added new section describing the #include
- macros..
+ top-level <ft2build.h>.
+
+ * include/config/ftheader.h: Added new section describing the #include
+ macros.
2001-03-17 Tom Kacvinsky <tjk@ams.org>
@@ -64,7 +71,7 @@
* src/cff/cffdrivr.c (get_cff_glyph_name): New function. Used in
cff_get_interface to facilitate getting a glyph name for glyph index
via FT_Get_Glyph_Name().
-
+
(cff_get_interface): Added support for getting a glyph name via the
"glyph_name" module interface. Uses the new function
get_cff_glyph_name().
@@ -75,7 +82,7 @@
not defined. This is to add support for getting a glyph name from a
glyph index via FT_Get_Glyph_Name().
Submitted by Sander van der Wal <svdwal@xs4all.nl>
-
+
* src/cff/cffgload.c (CFF_Parse_CharStrings): Added support for
deprecated operator "dotsection".
Submitted by Sander van der Wal <svdwal@xs4all.nl>
@@ -150,7 +157,7 @@
2001-03-05 Tom Kacvinsky <tjk@ams.org>
* src/cff/cffgload.c (CFF_Load_Glyph): Set glyph control data to the
- the Type 2 glyph charstring (used by conversion programs).
+ the Type 2 glyph charstring (used by conversion programs).
Submitted by Ha Shao <hashao@chinese.com>.
2001-03-04 Antoine Leca <Antoine.Leca@renault.fr>
@@ -304,7 +311,7 @@
2001-01-11 David Turner <david.turner@freetype.org>
- * docs/docmaker.py: Added cross-references generation as well as
+ * docs/docmaker.py: Added cross-references generation as well as
more robust handling of pathname wildcard matching.
2001-01-10 Werner Lemberg <wl@gnu.org>
@@ -332,7 +339,7 @@
2001-01-03 Tom Kacvinsky <tjk@ams.org>
* src/cff/rules.mk: Use cffgload.{c,h} instead of t2gload.{c,h}.
-
+
* include/freetype/internal/internal.h: Changed to use cfftypes.h
(cfferrs.h) instead of t2types.h (t2errors.h, respectively).
@@ -354,7 +361,7 @@
* src/cff/t2gload.h: Renamed cffgload.h.
* src/cff/t2gload.c: Renamed cffgload.c
-
+
2000-01-02 Jouk Jansen <joukj@hrem.stm.tudelft.nl>
* builds/vms: Support files for VMS architecture added.
@@ -398,7 +405,7 @@
* src/cff/t2gload.c (t2_lookup_glyph_by_stdcharcode,
t2_operator_seac): Added these functions for use in implementing the
- seac emulation provided by the Type 2 endchar operator.
+ seac emulation provided by the Type 2 endchar operator.
(T2_Parse_CharStrings): Added seac emulation for the endchar
operator.
@@ -406,13 +413,13 @@
CFF_Done_Encoding, CFF_Done_Charset): Extended to load and parse the
charset/encoding tables, and free the memory used by them when the
CFF driver is finished with them. Added tables
-
+
cff_isoadobe_charset
cff_expert_charset
cff_expertsubset_charset
cff_standard_encoding
cff_expert_encoding
-
+
so that the encoding/charset parser can handle predefined encodings and
charsets.
@@ -433,7 +440,7 @@
2000-12-21 David Turner <david.turner@freetype.org>
- * src/cid/cidafm.c, src/cid/cidafm.h: removed un-needed files,
+ * src/cid/cidafm.c, src/cid/cidafm.h: removed un-needed files,
we'll work on supporting CID AFM files later I guess :-)
2000-12-21 Tom Kacvinsky <tjk@ams.org>
@@ -459,7 +466,7 @@
2000-12-14 David Turner <david.turner@freetype.org>
- Added support for clipped direct rendering in the smooth renderer.
+ Added support for clipped direct rendering in the smooth renderer.
This should not break binary compatibility of existing applications.
* include/freetype/fttypes.h, include/freetype/ftimage.h: Move
@@ -468,7 +475,7 @@
FT_Raster_Flag enumeration.
Add `clip_box' element to FT_Raster_Params structure.
* src/smooth/ftgrays.c (grays_convert_glyph): Implement it.
-
+
* INSTALL: Updated installation instructions on Win32, listing the
new "make setup list" target used to list supported
compilers/targets.
@@ -483,7 +490,7 @@
to use direct definitions. This is the only way to do these things
in a portable way :-( The rest of the code should follow shortly
though everything compiles now.
-
+
* builds/compiler/intelc.mk, builds/compiler/watcom.mk: New files.
* builds/win32/detect.mk: Added support for the Intel C/C++
@@ -759,13 +766,13 @@
2000-11-22 Tom Kacvinsky <tjk@ams.org>
- * src/cff/t2objs.c (T2_Init_Face): For pure CFF fonts, set
+ * src/cff/t2objs.c (T2_Init_Face): For pure CFF fonts, set
`root->num_faces' to `cff->num_faces' and set `units_per_EM'
to 1000.
* src/cff/t2parse.c (parse_t2_real): Fixed real number parsing
loop.
-
+
* src/cff/t2load.c (T2_Get_String): Called T2_Get_Name with a
sid that was off by one.
diff --git a/INSTALL b/INSTALL
index 3365022..07c2641 100644
--- a/INSTALL
+++ b/INSTALL
@@ -60,14 +60,14 @@ I. From the command line
II. In your own environment (IDE)
---------------------------------
- You need to add the directories "freetype2/include" to
- your include path when compiling the library.
+ You need to add the directories "freetype2/include" to your include
+ path when compiling the library.
- FreeType 2 is made of several components, each one of them is located
- in a subdirectory of "freetype2/src". For example, 'freetype2/src/truetype/'
- contains the TrueType font driver.
+ FreeType 2 is made of several components; each one of them is
+ located in a subdirectory of "freetype2/src". For example,
+ `freetype2/src/truetype/' contains the TrueType font driver.
- DO NOT COMPILE ALL C FILES !! Rather, compile the following ones:
+ DO NOT COMPILE ALL C FILES! Rather, compile the following ones:
-- base components (required)
diff --git a/builds/win32/detect.mk b/builds/win32/detect.mk
index 54d0a73..c28d67f 100644
--- a/builds/win32/detect.mk
+++ b/builds/win32/detect.mk
@@ -86,12 +86,12 @@ ifeq ($(PLATFORM),win32)
.PHONY: visualc
endif
- ifneq ($(findstring intelc,$(MAKECMDGOALS)),) # Intel C/C++
+ ifneq ($(findstring intelc,$(MAKECMDGOALS)),) # Intel C/C++
CONFIG_FILE := w32-intl.mk
SEP := $(BACKSLASH)
CC := cl
visualc: setup
- .PHONY: visualc
+ .PHONY: intelc
endif
ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
diff --git a/docs/BUILD b/docs/BUILD
index 4223252..7bf70bf 100644
--- a/docs/BUILD
+++ b/docs/BUILD
@@ -13,8 +13,8 @@ instructions on how to compile the library on your favorite platform.
I. QUICK COMMAND-LINE GUIDE
---------------------------
- THE FOLLOWING WILL ONLY WORK WITH GNU MAKE, IT WILL FAIL MISERABLY
- WITH OTHER MAKE TOOLS, FOR EXAMPLE "BSD MAKE"..
+ THE FOLLOWING WILL ONLY WORK WITH GNU MAKE, IT WILL FAIL MISERABLY
+ WITH OTHER MAKE TOOLS, FOR EXAMPLE "BSD MAKE".
Install GNU Make (version 3.78.1 or newer), then try the following
on Unix or any system with gcc:
@@ -62,8 +62,8 @@ II. COMMAND-LINE COMPILATION
Make -- trying to build the library with any other Make tool will
*fail*.
- NEARLY ALL OTHER MAKE TOOLS WILL FAIL, INCLUDING "BSD MAKE", SO REALLY
- INSTALL A RECENT VERSION OF GNU MAKE ON YOUR SYSTEM !!
+ NEARLY ALL OTHER MAKE TOOLS WILL FAIL, INCLUDING "BSD MAKE", SO
+ REALLY INSTALL A RECENT VERSION OF GNU MAKE ON YOUR SYSTEM!
Make sure that you are invoking GNU Make from the command line, by
typing something like:
@@ -72,7 +72,7 @@ II. COMMAND-LINE COMPILATION
to display its version number.
- VERSION 3.78.1 OR NEWER IS NEEDED !!.
+ VERSION 3.78.1 OR NEWER IS NEEDED!
b. Invoke `make'
@@ -208,7 +208,7 @@ III. DETAILED COMPILATION PROCEDURE
src/truetype/truetype.c - the TrueType font driver
src/type1/type1.c - the Type 1 font driver
- The last module of FreeType 2, "winfonts" (implementing support for
+ The last module of FreeType 2, `winfonts' (implementing support for
Windows FNT format), is a single file.
To compile one component, do the following:
@@ -216,18 +216,18 @@ III. DETAILED COMPILATION PROCEDURE
- Add the top-level `include' directory to your compilation
include path
- - Add the `src/<component>' directory to your compilation include path,
- or simply 'cd' to the component's source directory
+ - Add the `src/<component>' directory to your compilation include
+ path, or simply `cd' to the component's source directory.
- Compile the component `source' file (see list below); you don't
- need to be in the component's directory if you added `src/<component>'
- to your include path..
+ need to be in the component's directory if you added
+ `src/<component>' to your include path.
For example, the following line can be used to compile the truetype
driver on Unix:
cd freetype2/
- cc -c -Iinclude -Isrc/truetype src/truetype/truetype.c
+ cc -c -Iinclude -Isrc/truetype src/truetype/truetype.c
Alternatively:
@@ -252,7 +252,7 @@ III. DETAILED COMPILATION PROCEDURE
IV. Support for flat-directory compilation
------------------------------------------
- It is possible to put all FreeType 2 source files into a single
+ It is possible to put all FreeType 2 source files into a single
directory, with the exception of the `include' hierarchy.
1. Copy all files in current directory:
@@ -270,7 +270,7 @@ IV. Support for flat-directory compilation
cc -c -Ifreetype2/include ftbase.c
etc.
- You don't need to define the FT_FLAT_COMPILATION macro (as this was required
- in previous releases of FreeType 2)
+ You don't need to define the FT_FLAT_COMPILATION macro (as this was
+ required in previous releases of FreeType 2).
End of file
diff --git a/docs/docmaker.py b/docs/docmaker.py
index 43786e8..067e162 100644
--- a/docs/docmaker.py
+++ b/docs/docmaker.py
@@ -901,12 +901,13 @@ class DocSectionList:
# provide a new one.
#
if abstract:
- section.block.print_error( "duplicate section definition for " +
- "'" + name + "'\n" +
- "previous definition in " +
- "'" + section.block.location() + "'\n" +
- "second definition in " +
- "'" + block.location() + "'" )
+ section.block.print_error(
+ "duplicate section definition for " +
+ "'" + name + "'\n" +
+ "previous definition in " +
+ "'" + section.block.location() + "'\n" +
+ "second definition in " +
+ "'" + block.location() + "'" )
else:
# The old section didn't contain an abstract; we are
# now going to replace it.
diff --git a/include/freetype/config/ftheader.h b/include/freetype/config/ftheader.h
index a7cddb3..917f1c8 100644
--- a/include/freetype/config/ftheader.h
+++ b/include/freetype/config/ftheader.h
@@ -60,318 +60,369 @@
/* */
/*************************************************************************/
-/*************************************************************************
- *
- * <Section> header_file_macros
- *
- * <Title> Header File Macros
- *
- * <Abstract>
- * Macro definitions used to #include specific header files
- *
- * <Description>
- * The following macros are defined to the name of specific FreeType 2
- * header files. They can be used directly in #include statements as in:
- *
- * {
- * #include FT_FREETYPE_H
- * #include FT_MULTIPLE_MASTERS_H
- * #include FT_GLYPH_H
- * }
- *
- * there are several reasons why we're now using macros to name
- * public header files. The first one is that the macros are not
- * limited to the infamous 8.3 naming rule required by Dos
- * (and FT_MULTIPLE_MASTERS_H is a lot more meaningful than "ftmm.h")
- *
- * The second reason is that is allows for more flexibility in the way
- * FreeType 2 is installed on a given system..
- *
- */
+ /*************************************************************************/
+ /* */
+ /* <Section> */
+ /* header_file_macros */
+ /* */
+ /* <Title> */
+ /* Header File Macros */
+ /* */
+ /* <Abstract> */
+ /* Macro definitions used to #include specific header files. */
+ /* */
+ /* <Description> */
+ /* The following macros are defined to the name of specific */
+ /* FreeType 2 header files. They can be used directly in #include */
+ /* statements as in: */
+ /* */
+ /* { */
+ /* #include FT_FREETYPE_H */
+ /* #include FT_MULTIPLE_MASTERS_H */
+ /* #include FT_GLYPH_H */
+ /* } */
+ /* */
+ /* There are several reasons why we are now using macros to name */
+ /* public header files. The first one is that such macros are not */
+ /* limited to the infamous 8.3 naming rule required by DOS (and */
+ /* `FT_MULTIPLE_MASTERS_H' is a lot more meaningful than `ftmm.h'). */
+ /* */
+ /* The second reason is that is allows for more flexibility in the */
+ /* way FreeType 2 is installed on a given system. */
+ /* */
+ /*************************************************************************/
/* configuration files */
-/*************************************************************************
- *
- * @macro: FT_CONFIG_CONFIG_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * FreeType 2 configuration
- */
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_CONFIG_CONFIG_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* FreeType 2 configuration data. */
+ /* */
#ifndef FT_CONFIG_CONFIG_H
-#define FT_CONFIG_CONFIG_H <freetype/config/ftconfig.h>
+#define FT_CONFIG_CONFIG_H <freetype/config/ftconfig.h>
#endif
-/*************************************************************************
- *
- * @macro: FT_CONFIG_OPTIONS_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * FreeType 2 project-specific configuration options
- */
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_CONFIG_OPTIONS_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* FreeType 2 project-specific configuration options. */
+ /* */
#ifndef FT_CONFIG_OPTIONS_H
-#define FT_CONFIG_OPTIONS_H <freetype/config/ftoption.h>
+#define FT_CONFIG_OPTIONS_H <freetype/config/ftoption.h>
#endif
-/*************************************************************************
- *
- * @macro: FT_CONFIG_MODULES_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the list of FreeType 2 modules that are statically linked to new
- * library instances in @FT_Init_FreeType
- */
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_CONFIG_MODULES_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the list of FreeType 2 modules that are statically linked to new */
+ /* library instances in @FT_Init_FreeType. */
+ /* */
#ifndef FT_CONFIG_MODULES_H
-#define FT_CONFIG_MODULES_H <freetype/config/ftmodule.h>
+#define FT_CONFIG_MODULES_H <freetype/config/ftmodule.h>
#endif
/* public headers */
-/*************************************************************************
- *
- * @macro: FT_FREETYPE_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the base FreeType 2 API
- */
-#define FT_FREETYPE_H <freetype/freetype.h>
-
-
-/*************************************************************************
- *
- * @macro: FT_ERRORS_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the list of FreeType 2 error codes (and messages).
- *
- * it is included by @FT_FREETYPE_H
- */
-#define FT_ERRORS_H <freetype/fterrors.h>
-
-/*************************************************************************
- *
- * @macro: FT_SYSTEM_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the FreeType 2 interface to low-level operations (i.e. memory management
- * and stream i/o)
- *
- * it is included by @FT_FREETYPE_H
- */
-#define FT_SYSTEM_H <freetype/ftsystem.h>
-
-/*************************************************************************
- *
- * @macro: FT_IMAGE_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * types definitions related to glyph images (i.e. bitmaps, outlines,
- * scan-converter parameters)
- *
- * it is included by @FT_FREETYPE_H
- */
-#define FT_IMAGE_H <freetype/ftimage.h>
-
-/*************************************************************************
- *
- * @macro: FT_TYPES_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the basic data types defined by FreeType 2
- *
- * it is included by @FT_FREETYPE_H
- */
-#define FT_TYPES_H <freetype/fttypes.h>
-
-/*************************************************************************
- *
- * @macro: FT_LIST_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the list management API of FreeType 2
- *
- * (most applications will never need to include this file)
- */
-#define FT_LIST_H <freetype/ftlist.h>
-
-
-/*************************************************************************
- *
- * @macro: FT_OUTLINE_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the scalable outline management API of FreeType 2
- */
-#define FT_OUTLINE_H <freetype/ftoutln.h>
-
-
-/*************************************************************************
- *
- * @macro: FT_MODULE_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the module management API of FreeType 2
- */
-#define FT_MODULE_H <freetype/ftmodule.h>
-
-/*************************************************************************
- *
- * @macro: FT_RENDER_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the renderer module management API of FreeType 2
- */
-#define FT_RENDER_H <freetype/ftrender.h>
-
-/*************************************************************************
- *
- * @macro: FT_TYPE1_TABLES_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the types and API specific to the Type 1 format.
- */
-#define FT_TYPE1_TABLES_H <freetype/t1tables.h>
-
-/*************************************************************************
- *
- * @macro: FT_TRUETYPE_IDS_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the enumeration values used to identify name strings, languages,
- * encodings, etc.. This file really contains a _large_ set of
- * constant macro definitions, taken from the TrueType and OpenType
- * specs..
- */
-#define FT_TRUETYPE_IDS_H <freetype/ttnameid.h>
-
-/*************************************************************************
- *
- * @macro: FT_TRUETYPE_TABLES_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the types and API specific to the TrueType (as well as OpenType) format.
- */
-#define FT_TRUETYPE_TABLES_H <freetype/tttables.h>
-
-/*************************************************************************
- *
- * @macro: FT_TRUETYPE_TAGS_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the definitions of TrueType 4-byte "tags" used to identify blocks
- * in SFNT-based font formats (i.e. TrueType and OpenType)
- */
-#define FT_TRUETYPE_TAGS_H <freetype/tttags.h>
-
-/*************************************************************************
- *
- * @macro: FT_GLYPH_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the API of the optional glyph management component.
- */
-#define FT_GLYPH_H <freetype/ftglyph.h>
-
-/*************************************************************************
- *
- * @macro: FT_BBOX_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the API of the optional exact bounding box computation routines
- */
-#define FT_BBOX_H <freetype/ftbbox.h>
-
-/*************************************************************************
- *
- * @macro: FT_CACHE_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the API of the optional FreeType 2 cache sub-system.
- */
-#define FT_CACHE_H <freetype/ftcache.h>
-
-/*************************************************************************
- *
- * @macro: FT_CACHE_IMAGE_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the "glyph image" API of the FreeType 2 cache sub-system
- *
- * it is used to define a cache for @FT_Glyph elements. You can also
- * see the API defined in @FT_CACHE_SMALL_BITMAPS_H if you only need
- * to store small glyph bitmaps, as it will use less memory
- */
-#define FT_CACHE_IMAGE_H <freetype/cache/ftcimage.h>
-
-/*************************************************************************
- *
- * @macro: FT_CACHE_SMALL_BITMAPS_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the "small bitmaps" API of the FreeType 2 cache sub-system
- *
- * it is used to define a cache for small glyph bitmaps in a relatively
- * memory-efficient way. You can also use the API defined in
- * @FT_CACHE_IMAGE_H if you want to cache arbitrary glyph images, including
- * scalable outlines.
- */
-#define FT_CACHE_SMALL_BITMAPS_H <freetype/cache/ftcsbits.h>
-
-/*************************************************************************
- *
- * @macro: FT_MAC_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the Macintosh-specific FreeType 2 API. The latter is used to
- * access fonts embedded in resource forks..
- *
- * this header file must be explicitely included by client applications
- * compiled on the Mac (note that the base API still works though)
- */
-#define FT_MAC_H <freetype/ftmac.h>
-
-/*************************************************************************
- *
- * @macro: FT_MULTIPLE_MASTERS_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the optional multiple-masters management API of FreeType 2
- */
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_FREETYPE_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the base FreeType 2 API. */
+ /* */
+#define FT_FREETYPE_H <freetype/freetype.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_ERRORS_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the list of FreeType 2 error codes (and messages). */
+ /* */
+ /* It is included by @FT_FREETYPE_H. */
+ /* */
+#define FT_ERRORS_H <freetype/fterrors.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_SYSTEM_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the FreeType 2 interface to low-level operations (i.e. memory */
+ /* management and stream i/o). */
+ /* */
+ /* It is included by @FT_FREETYPE_H. */
+ /* */
+#define FT_SYSTEM_H <freetype/ftsystem.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_IMAGE_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* types definitions related to glyph images (i.e. bitmaps, outlines, */
+ /* scan-converter parameters). */
+ /* */
+ /* It is included by @FT_FREETYPE_H. */
+ /* */
+#define FT_IMAGE_H <freetype/ftimage.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_TYPES_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the basic data types defined by FreeType 2. */
+ /* */
+ /* It is included by @FT_FREETYPE_H. */
+ /* */
+#define FT_TYPES_H <freetype/fttypes.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_LIST_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the list management API of FreeType 2. */
+ /* */
+ /* (Most applications will never need to include this file.) */
+ /* */
+#define FT_LIST_H <freetype/ftlist.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_OUTLINE_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the scalable outline management API of FreeType 2. */
+ /* */
+#define FT_OUTLINE_H <freetype/ftoutln.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_MODULE_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the module management API of FreeType 2. */
+ /* */
+#define FT_MODULE_H <freetype/ftmodule.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_RENDER_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the renderer module management API of FreeType 2. */
+ /* */
+#define FT_RENDER_H <freetype/ftrender.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_TYPE1_TABLES_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the types and API specific to the Type 1 format. */
+ /* */
+#define FT_TYPE1_TABLES_H <freetype/t1tables.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_TRUETYPE_IDS_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the enumeration values used to identify name strings, languages, */
+ /* encodings, etc. This file really contains a _large_ set of */
+ /* constant macro definitions, taken from the TrueType and OpenType */
+ /* specifications. */
+ /* */
+#define FT_TRUETYPE_IDS_H <freetype/ttnameid.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_TRUETYPE_TABLES_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the types and API specific to the TrueType (as well as OpenType) */
+ /* format. */
+ /* */
+#define FT_TRUETYPE_TABLES_H <freetype/tttables.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_TRUETYPE_TAGS_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the definitions of TrueType 4-byte `tags' used to identify blocks */
+ /* in SFNT-based font formats (i.e. TrueType and OpenType). */
+ /* */
+#define FT_TRUETYPE_TAGS_H <freetype/tttags.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_GLYPH_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the API of the optional glyph management component. */
+ /* */
+#define FT_GLYPH_H <freetype/ftglyph.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_BBOX_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the API of the optional exact bounding box computation routines. */
+ /* */
+#define FT_BBOX_H <freetype/ftbbox.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_CACHE_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the API of the optional FreeType 2 cache sub-system. */
+ /* */
+#define FT_CACHE_H <freetype/ftcache.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_CACHE_IMAGE_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the `glyph image' API of the FreeType 2 cache sub-system. */
+ /* */
+ /* It is used to define a cache for @FT_Glyph elements. You can also */
+ /* see the API defined in @FT_CACHE_SMALL_BITMAPS_H if you only need */
+ /* to store small glyph bitmaps, as it will use less memory. */
+ /* */
+#define FT_CACHE_IMAGE_H <freetype/cache/ftcimage.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_CACHE_SMALL_BITMAPS_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the `small bitmaps' API of the FreeType 2 cache sub-system. */
+ /* */
+ /* It is used to define a cache for small glyph bitmaps in a */
+ /* relatively memory-efficient way. You can also use the API defined */
+ /* in @FT_CACHE_IMAGE_H if you want to cache arbitrary glyph images, */
+ /* including scalable outlines. */
+ /* */
+#define FT_CACHE_SMALL_BITMAPS_H <freetype/cache/ftcsbits.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_MAC_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the Macintosh-specific FreeType 2 API. The latter is used to */
+ /* access fonts embedded in resource forks. */
+ /* */
+ /* This header file must be explicitly included by client */
+ /* applications compiled on the Mac (note that the base API still */
+ /* works though). */
+ /* */
+#define FT_MAC_H <freetype/ftmac.h>
+
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_MULTIPLE_MASTERS_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the optional multiple-masters management API of FreeType 2. */
+ /* */
#define FT_MULTIPLE_MASTERS_H <freetype/ftmm.h>
-/*************************************************************************
- *
- * @macro: FT_SFNT_NAMES_H
- *
- * @description:
- * a macro used in #include statements to name the file containing
- * the optional FreeType 2 API used to access embedded "name" strings
- * in SFNT-based font formats (i.e. TrueType and OpenType)
- */
-#define FT_SFNT_NAMES_H <freetype/ftsnames.h>
-
- /* */
+
+ /*************************************************************************/
+ /* */
+ /* @macro: */
+ /* FT_SFNT_NAMES_H */
+ /* */
+ /* @description: */
+ /* A macro used in #include statements to name the file containing */
+ /* the optional FreeType 2 API used to access embedded `name' strings */
+ /* in SFNT-based font formats (i.e. TrueType and OpenType). */
+ /* */
+#define FT_SFNT_NAMES_H <freetype/ftsnames.h>
+
+ /* */
+
#define FT_SYNTHESIS_H <freetype/ftsynth.h>
@@ -382,6 +433,7 @@
#define FT_CACHE_INTERNAL_CHUNK_H <freetype/cache/ftcchunk.h>
/* now include internal headers definitions from <freetype/internal/...> */
+
#define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h>
#include FT_INTERNAL_INTERNAL_H
diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h
index 9f80951..32de95f 100644
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -276,9 +276,9 @@ FT_BEGIN_HEADER
/* FT_Offset */
/* */
/* <Description> */
- /* This is equivalent to the ANSI C "size_t" type, i.e. it's the */
- /* largest _unsigned_ integer type used to express a file size or */
- /* position, or a memory block size. */
+ /* This is equivalent to the ANSI C `size_t' type, i.e. the largest */
+ /* _unsigned_ integer type used to express a file size or position, */
+ /* or a memory block size. */
/* */
typedef size_t FT_Offset;
@@ -289,7 +289,7 @@ FT_BEGIN_HEADER
/* FT_PtrDist */
/* */
/* <Description> */
- /* This is equivalent to the ANSI C "ptrdiff_t" type, i.e. the */
+ /* This is equivalent to the ANSI C `ptrdiff_t' type, i.e. the */
/* largest _signed_ integer type used to express the distance */
/* between two pointers. */
/* */
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 03fe64e..ecd99af 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -2079,10 +2079,10 @@
}
- FT_EXPORT_DEF(FT_Error)
- FT_Render_Glyph_Internal( FT_Library library,
- FT_GlyphSlot slot,
- FT_UInt render_mode )
+ FT_EXPORT_DEF( FT_Error ) FT_Render_Glyph_Internal(
+ FT_Library library,
+ FT_GlyphSlot slot,
+ FT_UInt render_mode )
{
FT_Error error = FT_Err_Ok;
FT_Renderer renderer;
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index a3b2284..1082280 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -225,14 +225,15 @@
FT_Pointer buffer,
FT_UInt buffer_max )
{
- CFF_Font* font = (CFF_Font*)face->extra.data;
+ CFF_Font* font = (CFF_Font*)face->extra.data;
FT_Memory memory = FT_FACE_MEMORY(face);
FT_String* gname;
FT_UShort sid;
PSNames_Interface* psnames;
FT_Error error;
- psnames = (PSNames_Interface*)FT_Get_Module_Interface( face->root.driver->root.library, "psnames" );
+ psnames = (PSNames_Interface*)FT_Get_Module_Interface(
+ face->root.driver->root.library, "psnames" );
if ( !psnames )
{
@@ -255,7 +256,7 @@
FT_UInt len = strlen( gname );
- if (len >= buffer_max)
+ if ( len >= buffer_max )
len = buffer_max - 1;
MEM_Copy( buffer, gname, len );
@@ -269,6 +270,7 @@
return error;
}
+
/*************************************************************************/
/* */
/* <Function> */
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index e602034..4850e3d 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -1066,7 +1066,6 @@
case cff_op_hintmask:
case cff_op_cntrmask:
-
FT_TRACE4(( op == cff_op_hintmask ? " hintmask"
: " cntrmask" ));
@@ -1078,7 +1077,9 @@
FT_TRACE4(( " " ));
- for ( maskbyte = 0; maskbyte < ( decoder->num_hints + 7 ) >> 3 ; maskbyte++, ip++ )
+ for ( maskbyte = 0;
+ maskbyte < ( decoder->num_hints + 7 ) >> 3;
+ maskbyte++, ip++ )
{
FT_TRACE4(( "%02X", *ip ));
}
@@ -1839,10 +1840,8 @@
goto Unimplemented;
case cff_op_dotsection:
- {
- /* this operator is deprecated and ignored by the parser */
- FT_TRACE4(( " dotsection" ));
- }
+ /* this operator is deprecated and ignored by the parser */
+ FT_TRACE4(( " dotsection" ));
break;
case cff_op_and:
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index 2dd0728..beb741e 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -8,7 +8,7 @@
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
-/* modified, and xdistributed under the terms of the FreeType project */
+/* modified, and distributed under the terms of the FreeType project */
/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
/* this file you indicate that you have read the license and */
/* understand and accept it fully. */
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 2fac114..80a8316 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -388,8 +388,8 @@
/* set global bbox, as well as EM size */
root->bbox = dict->font_bbox;
- root->ascender = (FT_Short)(root->bbox.yMax >> 16);
- root->descender = (FT_Short)(root->bbox.yMin >> 16);
+ root->ascender = (FT_Short)( root->bbox.yMax >> 16 );
+ root->descender = (FT_Short)( root->bbox.yMin >> 16 );
root->height = ( ( root->ascender - root->descender ) * 12 ) / 10;
if ( dict->units_per_em )
diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c
index da53be5..94f2b82 100644
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -339,7 +339,7 @@
temp = ABS( matrix->yy );
*upm = (FT_UShort)( FT_DivFix( 0x10000L,
- FT_DivFix( temp, 1000 ) ) >> 16 );
+ FT_DivFix( temp, 1000 ) ) >> 16 );
if ( temp != 0x10000L )
{
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
index 4fe8c29..a191cec 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -225,8 +225,8 @@
if ( !root->units_per_EM )
root->units_per_EM = 1000;
- root->ascender = (FT_Short)(face->cid.font_bbox.yMax >> 16);
- root->descender = (FT_Short)(face->cid.font_bbox.yMin >> 16);
+ root->ascender = (FT_Short)( face->cid.font_bbox.yMax >> 16 );
+ root->descender = (FT_Short)( face->cid.font_bbox.yMin >> 16 );
root->height = ( ( root->ascender + root->descender ) * 12 )
/ 10;
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index 0b7d358..ca38ca7 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -981,10 +981,10 @@ THE SOFTWARE.
yres = find_property( face, "RESOLUTION_Y" );
if ( ( xres != NULL ) && ( yres != NULL ) )
{
- root->available_sizes->width = (FT_Short)
- (prop->value.integer * 75 / xres->value.integer);
- root->available_sizes->height = (FT_Short)
- (prop->value.integer * 75 / yres->value.integer);
+ root->available_sizes->width =
+ (FT_Short)( prop->value.integer * 75 / xres->value.integer );
+ root->available_sizes->height =
+ (FT_Short)( prop->value.integer * 75 / yres->value.integer );
}
}
else
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index bb8d69f..fedd93e 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -268,20 +268,19 @@
root->num_fixed_sizes = 0;
root->available_sizes = 0;
- root->bbox = face->type1.font_bbox;
+ root->bbox = face->type1.font_bbox;
/* Set units_per_EM if we didn't set it in parse_font_matrix. */
if ( !root->units_per_EM )
root->units_per_EM = 1000;
- root->ascender = (FT_Short)(face->type1.font_bbox.yMax >> 16);
- root->descender = (FT_Short)(face->type1.font_bbox.yMin >> 16);
- root->height = ( ( root->ascender - root->descender ) * 12 ) / 10;
+ root->ascender = (FT_Short)( face->type1.font_bbox.yMax >> 16 );
+ root->descender = (FT_Short)( face->type1.font_bbox.yMin >> 16 );
+ root->height = ( ( root->ascender - root->descender ) * 12 ) / 10;
/* now compute the maximum advance width */
-
-
- root->max_advance_width = (FT_Short)(face->type1.font_bbox.xMax >> 16);
+ root->max_advance_width =
+ (FT_Short)( face->type1.font_bbox.xMax >> 16 );
{
FT_Int max_advance;