Commit e274cfd3ef1164ebc3c3cf8614f0f0549babe762
2001-03-04T21:53:08
* src/autohint/ahtypes.h (AH_Hinter): Add elements `disable_horz_edges', `disable_vert_edges'. * src/autohint/ahhint.c (ah_hint_edges_3, ah_hinter_hint_edges): Use them (and remove static variables with the same names). * src/pcf/pcfutil.c (BitOrderInvert): Add `const'. * docs/glnames.py: Updated to latest pstables.h changes. * src/psnames/pstables.h: Add more `const'. * src/pcf/pcfutil.c: Ditto. * src/base/ftglyph.c (FT_Glyph_To_Bitmap): Fixing typo (FT_Glyph_Done -> FT_Done_Glyph). * include/freetype/ttnameid.h: Added some new Microsoft language codes and LCIDs as found in Office Xp. * builds/hurd/detect.mk: New file. Added support to detect the GNU Hurd operating system as Unix-like. Fix submitted by Anthony Fok <foka@debian.org>. * src/type1/t1gload.c (T1_Load_Glyph): Set glyph control data to the the Type 1 glyph charstring (used by conversion programs). Submitted by Ha Shao <hashao@chinese.com>. * src/base/ftgrays.c (grays_sweep): The function didn't exit immediately if `num_cells' was 0 as it should. Thanks to Boris for finding this out. * src/base/ftglyph.c (FT_Glyph_To_Bitmap): Fixed memory leak when bitmap rendering fails (thanks to Graham Asher). * docs/docmaker.py, include/freetype/*.h: Updated the DocMaker script to support chapters and section block ordering. Updated the public header files accordingly. * src/base/ftglyph.c (FT_Glyph_Copy): Advance width and glyph format were not correctly copied.
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
diff --git a/ChangeLog b/ChangeLog
index 08b0756..c4139ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,25 +1,45 @@
-2001-03-01 Antoine Leca <Antoine.Leca@renault.fr>
+2001-03-04 Werner Lemberg <wl@gnu.org>
- * include/freetype/ttnameid.h: added some new Microsoft language
- codes and LCIDs as found in Office Xp.
+ * src/autohint/ahtypes.h (AH_Hinter): Add elements
+ `disable_horz_edges', `disable_vert_edges'.
+ * src/autohint/ahhint.c (ah_hint_edges_3, ah_hinter_hint_edges): Use
+ them (and remove static variables with the same names).
+ * src/pcf/pcfutil.c (BitOrderInvert): Add `const'.
+ * docs/glnames.py: Updated to latest pstables.h changes.
-2001-02-28 David Turner <david.turner@freetype.org>
+2001-03-04 Sander van der Wal <svdwal@xs4all.nl>
- * builds/hurd/detect.mk: added support to detect the GNU Hurd operating
- system as Unix-like. Fix submitted by Anthony Fok <foka@debian.org>
+ * src/psnames/pstables.h: Add more `const'.
+ * src/pcf/pcfutil.c: Ditto.
- * src/type1/t1gload.c (T1_Load_Glyph): set glyph control data to the
- the Type 1 glyph charstring. (used by conversion programs).
- submitted by Ha Shao <hashao@chinese.com>
+2001-03-04 Werner Lemberg <wl@gnu.org>
-2001-02-22 David Turner <david.turner@freetype.org>
+ * src/base/ftglyph.c (FT_Glyph_To_Bitmap): Fixing typo
+ (FT_Glyph_Done -> FT_Done_Glyph).
- * src/base/ftgrays.c (grays_sweep): the function didn't exit
- immediately if "num_cells" was 0 as it should. Thanks to Boris
- for finding this out.
+2001-03-01 Antoine Leca <Antoine.Leca@renault.fr>
- * src/base/ftglyph.c (FT_Glyph_To_Bitmap): fixed memory leak when
- bitmap rendering fails.. (thanks to Graham Asher)
+ * include/freetype/ttnameid.h: Added some new Microsoft language
+ codes and LCIDs as found in Office Xp.
+
+2001-02-28 David Turner <david.turner@freetype.org>
+
+ * builds/hurd/detect.mk: New file. Added support to detect the GNU
+ Hurd operating system as Unix-like. Fix submitted by Anthony Fok
+ <foka@debian.org>.
+
+ * src/type1/t1gload.c (T1_Load_Glyph): Set glyph control data to the
+ the Type 1 glyph charstring (used by conversion programs).
+ Submitted by Ha Shao <hashao@chinese.com>.
+
+2001-02-22 David Turner <david.turner@freetype.org>
+
+ * src/base/ftgrays.c (grays_sweep): The function didn't exit
+ immediately if `num_cells' was 0 as it should. Thanks to Boris for
+ finding this out.
+
+ * src/base/ftglyph.c (FT_Glyph_To_Bitmap): Fixed memory leak when
+ bitmap rendering fails (thanks to Graham Asher).
2001-02-13 Werner Lemberg <wl@gnu.org>
@@ -30,12 +50,12 @@
2001-02-13 David Turner <david.turner@freetype.org>
- * docs/docmaker.py, include/freetype/*.h: Updated the DocMaker script
- to support chapters and section block ordering. Updated the public
- header files accordingly.
+ * docs/docmaker.py, include/freetype/*.h: Updated the DocMaker
+ script to support chapters and section block ordering. Updated the
+ public header files accordingly.
- * src/base/ftglyph.c: fixed a bug in FT_Glyph_Copy, where the advance
- and glyph format were not correctly copied..
+ * src/base/ftglyph.c (FT_Glyph_Copy): Advance width and glyph format
+ were not correctly copied.
2001-02-08 Tom Kacvinsky <tjk@ams.org>
diff --git a/docs/glnames.py b/docs/glnames.py
index 5553ceb..6179f00 100644
--- a/docs/glnames.py
+++ b/docs/glnames.py
@@ -1533,7 +1533,7 @@ def dump_glyph_list( file, glyph_list, adobe_extra ):
name_list = []
- write( " static const char* standard_glyph_names[] =\n" )
+ write( " static const char* const standard_glyph_names[] =\n" )
write( " {\n" )
for name in glyph_list:
@@ -1666,7 +1666,7 @@ def main():
name_list = dump_glyph_list( file, base_list, adobe_list )
# dump t1_standard_list
- write( " static const char** t1_standard_glyphs = " \
+ write( " static const char* const * const t1_standard_glyphs = " \
+ "standard_glyph_names + " + repr( t1_bias ) + ";\n" )
write( "\n" )
write( "\n" )
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index cc5e521..d0fb855 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -55,72 +55,103 @@ FT_BEGIN_HEADER
/*************************************************************************/
- /*************************************************************************
- *
- * <Section>
- * base_interface
- *
- * <Title>
- * Base Interface
- *
- * <Abstract>
- * The FreeType 2 base font interface
- *
- * <Description>
- * This section describes the public high-level API of FreeType 2
- *
- * <Order>
- * FT_Library FT_Face FT_Size FT_GlyphSlot FT_CharMap FT_Encoding
- *
- * FT_FaceRec
- *
- * FT_FACE_FLAG_SCALABLE
- * FT_FACE_FLAG_FIXED_SIZES
- * FT_FACE_FLAG_FIXED_WIDTH
- * FT_FACE_FLAG_HORIZONTAL
- * FT_FACE_FLAG_VERTICAL
- * FT_FACE_FLAG_SFNT
- * FT_FACE_FLAG_KERNING
- * FT_FACE_FLAG_MULTIPLE_MASTERS
- * FT_FACE_FLAG_GLYPH_NAMES
- * FT_FACE_FLAG_EXTERNAL_STREAM
- * FT_FACE_FLAG_FAST_GLYPHS
- *
- * FT_STYLE_FLAG_BOLD
- * FT_STYLE_FLAG_ITALIC
- *
- * FT_SizeRec FT_Size_Metrics
- *
- * FT_GlyphSlotRec FT_Glyph_Metrics FT_SubGlyph
- *
- * FT_Bitmap_Size
- *
- * FT_Init_FreeType FT_Done_FreeType
- *
- * FT_New_Face FT_Done_Face FT_New_Memory_Face
- * FT_Open_Face FT_Open_Args FT_Open_Flags FT_Parameter
- * FT_Attach_File FT_Attach_Stream
- *
- * FT_Set_Char_Size FT_Set_Pixel_Sizes FT_Set_Transform
- * FT_Load_Glyph FT_Get_Char_Index FT_Load_Char
- *
- * FT_LOAD_DEFAULT FT_LOAD_RENDER FT_LOAD_MONOCHROME
- * FT_LOAD_LINEAR_DESIGN FT_LOAD_NO_SCALE FT_LOAD_NO_HINTING
- * FT_LOAD_NO_BITMAP FT_LOAD_CROP_BITMAP
- *
- * FT_LOAD_VERTICAL_LAYOUT FT_LOAD_IGNORE_TRANSFORM
- * FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH FT_LOAD_FORCE_AUTOHINT
- * FT_LOAD_NO_RECURSE FT_LOAD_PEDANTIC
- *
- * FT_Render_Glyph FT_Render_Mode
- * FT_Get_Kerning FT_Kerning_Mode FT_Get_Glyph_Name
- *
- * FT_CharMapRec FT_Select_Charmap FT_Set_Charmap
- *
- */
+ /*************************************************************************/
+ /* */
+ /* <Section> */
+ /* base_interface */
+ /* */
+ /* <Title> */
+ /* Base Interface */
+ /* */
+ /* <Abstract> */
+ /* The FreeType 2 base font interface. */
+ /* */
+ /* <Description> */
+ /* This section describes the public high-level API of FreeType 2. */
+ /* */
+ /* <Order> */
+ /* FT_Library */
+ /* FT_Face */
+ /* FT_Size */
+ /* FT_GlyphSlot */
+ /* FT_CharMap */
+ /* FT_Encoding */
+ /* */
+ /* FT_FaceRec */
+ /* */
+ /* FT_FACE_FLAG_SCALABLE */
+ /* FT_FACE_FLAG_FIXED_SIZES */
+ /* FT_FACE_FLAG_FIXED_WIDTH */
+ /* FT_FACE_FLAG_HORIZONTAL */
+ /* FT_FACE_FLAG_VERTICAL */
+ /* FT_FACE_FLAG_SFNT */
+ /* FT_FACE_FLAG_KERNING */
+ /* FT_FACE_FLAG_MULTIPLE_MASTERS */
+ /* FT_FACE_FLAG_GLYPH_NAMES */
+ /* FT_FACE_FLAG_EXTERNAL_STREAM */
+ /* FT_FACE_FLAG_FAST_GLYPHS */
+ /* */
+ /* FT_STYLE_FLAG_BOLD */
+ /* FT_STYLE_FLAG_ITALIC */
+ /* */
+ /* FT_SizeRec */
+ /* FT_Size_Metrics */
+ /* */
+ /* FT_GlyphSlotRec */
+ /* FT_Glyph_Metrics */
+ /* FT_SubGlyph */
+ /* */
+ /* FT_Bitmap_Size */
+ /* */
+ /* FT_Init_FreeType */
+ /* FT_Done_FreeType */
+ /* */
+ /* FT_New_Face */
+ /* FT_Done_Face */
+ /* FT_New_Memory_Face */
+ /* FT_Open_Face */
+ /* FT_Open_Args */
+ /* FT_Open_Flags */
+ /* FT_Parameter */
+ /* FT_Attach_File */
+ /* FT_Attach_Stream */
+ /* */
+ /* FT_Set_Char_Size */
+ /* FT_Set_Pixel_Sizes */
+ /* FT_Set_Transform */
+ /* FT_Load_Glyph */
+ /* FT_Get_Char_Index */
+ /* FT_Load_Char */
+ /* */
+ /* FT_LOAD_DEFAULT */
+ /* FT_LOAD_RENDER */
+ /* FT_LOAD_MONOCHROME */
+ /* FT_LOAD_LINEAR_DESIGN */
+ /* FT_LOAD_NO_SCALE */
+ /* FT_LOAD_NO_HINTING */
+ /* FT_LOAD_NO_BITMAP */
+ /* FT_LOAD_CROP_BITMAP */
+ /* */
+ /* FT_LOAD_VERTICAL_LAYOUT */
+ /* FT_LOAD_IGNORE_TRANSFORM */
+ /* FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH */
+ /* FT_LOAD_FORCE_AUTOHINT */
+ /* FT_LOAD_NO_RECURSE */
+ /* FT_LOAD_PEDANTIC */
+ /* */
+ /* FT_Render_Glyph */
+ /* FT_Render_Mode */
+ /* FT_Get_Kerning */
+ /* FT_Kerning_Mode */
+ /* FT_Get_Glyph_Name */
+ /* */
+ /* FT_CharMapRec */
+ /* FT_Select_Charmap */
+ /* FT_Set_Charmap */
+ /* */
+ /*************************************************************************/
-
/*************************************************************************/
/* */
/* <Struct> */
@@ -2193,11 +2224,16 @@ FT_BEGIN_HEADER
/* computations on 16.16 fixed-float numbers or 2d vectors. */
/* */
/* <Order> */
- /* FT_MulDiv FT_MulFix FT_DivFix FT_Vector_Transform */
- /* FT_Matrix_Multiply FT_Matrix_Invert */
+ /* FT_MulDiv */
+ /* FT_MulFix */
+ /* FT_DivFix */
+ /* FT_Vector_Transform */
+ /* FT_Matrix_Multiply */
+ /* FT_Matrix_Invert */
/* */
/*************************************************************************/
+
/*************************************************************************/
/* */
/* <Function> */
diff --git a/include/freetype/ftchapters.h b/include/freetype/ftchapters.h
index 285f0c1..cb1c33d 100644
--- a/include/freetype/ftchapters.h
+++ b/include/freetype/ftchapters.h
@@ -1,43 +1,52 @@
-/*************************************************************************
- *
- * <Chapter> core_api
- *
- * <Title> Core API
- *
- * <Sections>
- * basic_types
- * base_interface
- * glyph_management
- * mac_specific
- * multiple_masters
- * truetype_tables
- * type1_tables
- * sfnt_names
- * module_management
- * system_interface
- */
+/***************************************************************************/
+/* */
+/* <Chapter> */
+/* core_api */
+/* */
+/* <Title> */
+/* Core API */
+/* */
+/* <Sections> */
+/* basic_types */
+/* base_interface */
+/* glyph_management */
+/* mac_specific */
+/* multiple_masters */
+/* truetype_tables */
+/* type1_tables */
+/* sfnt_names */
+/* module_management */
+/* system_interface */
+/* */
+/***************************************************************************/
-/*************************************************************************
- *
- * <Chapter> cache_subsystem
- *
- * <Title> Cache Sub-System
- *
- * <Sections>
- * cache_subsystem
- *
- */
-/*************************************************************************
- *
- * <Chapter> support_api
- *
- * <Title> Support API
- *
- * <Sections>
- * computations
- * list_processing
- * outline_processing
- * raster
- */
-
+/***************************************************************************/
+/* */
+/* <Chapter> */
+/* cache_subsystem */
+/* */
+/* <Title> */
+/* Cache Sub-System */
+/* */
+/* <Sections> */
+/* cache_subsystem */
+/* */
+/***************************************************************************/
+
+
+/***************************************************************************/
+/* */
+/* <Chapter> */
+/* support_api */
+/* */
+/* <Title> */
+/* Support API */
+/* */
+/* <Sections> */
+/* computations */
+/* list_processing */
+/* outline_processing */
+/* raster */
+/* */
+/***************************************************************************/
diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index 22e93bb..aec6db9 100644
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -104,7 +104,6 @@ FT_BEGIN_HEADER
} FT_BBox;
-
/*************************************************************************/
/* */
/* <Enum> */
diff --git a/include/freetype/ftlist.h b/include/freetype/ftlist.h
index d6d8a27..814ef08 100644
--- a/include/freetype/ftlist.h
+++ b/include/freetype/ftlist.h
@@ -51,10 +51,19 @@ FT_BEGIN_HEADER
/* processing using doubly-linked nodes. */
/* */
/* <Order> */
- /* FT_List FT_ListNode FT_ListRec FT_ListNodeRec */
+ /* FT_List */
+ /* FT_ListNode */
+ /* FT_ListRec */
+ /* FT_ListNodeRec */
/* */
- /* FT_List_Add FT_List_Insert FT_List_Find FT_List_Remove FT_List_Up */
- /* FT_List_Iterate FT_List_Iterator FT_List_Finalize */
+ /* FT_List_Add */
+ /* FT_List_Insert */
+ /* FT_List_Find */
+ /* FT_List_Remove */
+ /* FT_List_Up */
+ /* FT_List_Iterate */
+ /* FT_List_Iterator */
+ /* FT_List_Finalize */
/* FT_List_Destructor */
/* */
/*************************************************************************/
diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h
index ffc8e15..da4d2cb 100644
--- a/include/freetype/ftoutln.h
+++ b/include/freetype/ftoutln.h
@@ -45,16 +45,26 @@ FT_BEGIN_HEADER
/* transformed, and converted into bitmaps and pixmaps. */
/* */
/* <Order> */
- /* FT_Outline FT_Outline_Flags */
- /* FT_Outline_New FT_Outline_Done FT_Outline_Copy */
- /* FT_Outline_Translate FT_Outline_Transform FT_Outline_Reverse */
+ /* FT_Outline */
+ /* FT_Outline_Flags */
+ /* FT_Outline_New */
+ /* FT_Outline_Done */
+ /* FT_Outline_Copy */
+ /* FT_Outline_Translate */
+ /* FT_Outline_Transform */
+ /* FT_Outline_Reverse */
/* */
- /* FT_Outline_Get_CBox FT_Outline_Get_BBox */
+ /* FT_Outline_Get_CBox */
+ /* FT_Outline_Get_BBox */
/* */
- /* FT_Outline_Get_Bitmap FT_Outline_Render */
+ /* FT_Outline_Get_Bitmap */
+ /* FT_Outline_Render */
/* */
- /* FT_Outline_Decompose FT_Outline_Funcs FT_Outline_MoveTo_Func */
- /* FT_Outline_LineTo_Func FT_Outline_ConicTo_Func */
+ /* FT_Outline_Decompose */
+ /* FT_Outline_Funcs */
+ /* FT_Outline_MoveTo_Func */
+ /* FT_Outline_LineTo_Func */
+ /* FT_Outline_ConicTo_Func */
/* FT_Outline_CubicTo_Func */
/* */
/*************************************************************************/
diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h
index 14cd791..607ba43 100644
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -30,32 +30,51 @@
FT_BEGIN_HEADER
- /*************************************************************************
- *
- * <Section>
- * basic_types
- *
- * <Title>
- * Basic Types
- *
- * <Abstract>
- * The basic data types defined by the library.
- *
- * <Description>
- * This section contains the basic data types defined by FreeType 2,
- * ranging from simple scalar types to font specific ones
- *
- * <Order>
- * FT_Byte FT_Char FT_Int FT_UInt FT_Short FT_UShort FT_Long FT_ULong
- * FT_Bool FT_Error FT_Fixed FT_Pointer FT_Pos FT_Vector FT_BBox
- * FT_Matrix
- *
- * FT_Generic FT_Generic_Finalizer
- *
- * FT_Bitmap FT_Pixel_Mode FT_Palette_Mode FT_Glyph_Format FT_IMAGE_TAG
- * FT_Glyph_Format
- *
- */
+ /*************************************************************************/
+ /* */
+ /* <Section> */
+ /* basic_types */
+ /* */
+ /* <Title> */
+ /* Basic Types */
+ /* */
+ /* <Abstract> */
+ /* The basic data types defined by the library. */
+ /* */
+ /* <Description> */
+ /* This section contains the basic data types defined by FreeType 2, */
+ /* ranging from simple scalar types to font specific ones. */
+ /* */
+ /* <Order> */
+ /* FT_Byte */
+ /* FT_Char */
+ /* FT_Int */
+ /* FT_UInt */
+ /* FT_Short */
+ /* FT_UShort */
+ /* FT_Long */
+ /* FT_ULong */
+ /* FT_Bool */
+ /* FT_Error */
+ /* FT_Fixed */
+ /* FT_Pointer */
+ /* FT_Pos */
+ /* FT_Vector */
+ /* FT_BBox */
+ /* FT_Matrix */
+ /* */
+ /* FT_Generic */
+ /* FT_Generic_Finalizer */
+ /* */
+ /* FT_Bitmap */
+ /* FT_Pixel_Mode */
+ /* FT_Palette_Mode */
+ /* FT_Glyph_Format */
+ /* FT_IMAGE_TAG */
+ /* FT_Glyph_Format */
+ /* */
+ /*************************************************************************/
+
/*************************************************************************/
/* */
diff --git a/src/autohint/ahhint.c b/src/autohint/ahhint.c
index 70d422e..64ace00 100644
--- a/src/autohint/ahhint.c
+++ b/src/autohint/ahhint.c
@@ -40,10 +40,6 @@
/*************************************************************************/
- static int disable_horz_edges = 0;
- static int disable_vert_edges = 0;
-
-
/* snap a given width in scaled coordinates to one of the */
/* current standard widths */
static
@@ -214,10 +210,10 @@
int has_serifs = 0;
- if ( disable_vert_edges && !dimension )
+ if ( hinter->disable_vert_edges && !dimension )
goto Next_Dimension;
- if ( disable_horz_edges && dimension )
+ if ( hinter->disable_horz_edges && dimension )
goto Next_Dimension;
/* we begin by aligning all stems relative to the blue zone */
@@ -381,11 +377,11 @@
FT_LOCAL_DEF
void ah_hinter_hint_edges( AH_Hinter* hinter,
- int no_horz_edges,
- int no_vert_edges )
+ FT_Bool no_horz_edges,
+ FT_Bool no_vert_edges )
{
- disable_horz_edges = no_horz_edges;
- disable_vert_edges = no_vert_edges;
+ hinter->disable_horz_edges = no_horz_edges;
+ hinter->disable_vert_edges = no_vert_edges;
/* AH_Interpolate_Blue_Edges( hinter ); -- doesn't seem to help */
/* reduce the problem of the disappearing eye in the `e' of Times... */
diff --git a/src/autohint/ahtypes.h b/src/autohint/ahtypes.h
index 8e47379..5d94330 100644
--- a/src/autohint/ahtypes.h
+++ b/src/autohint/ahtypes.h
@@ -480,6 +480,8 @@ FT_BEGIN_HEADER
FT_Vector trans_delta;
FT_Matrix trans_matrix;
+ FT_Bool disable_horz_edges;
+ FT_Bool disable_vert_edges;
} AH_Hinter;
diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
index 20d2cdf..811820f 100644
--- a/src/base/ftglyph.c
+++ b/src/base/ftglyph.c
@@ -602,9 +602,9 @@
if ( !error )
error = FT_Render_Glyph_Internal( glyph->library, &dummy, render_mode );
- if (error)
+ if ( error )
{
- FT_Glyph_Done( FT_GLYPH(bitmap) );
+ FT_Done_Glyph( FT_GLYPH( bitmap ) );
goto Exit;
}
diff --git a/src/pcf/pcfutil.c b/src/pcf/pcfutil.c
index 4bcc5aa..e0253ca 100644
--- a/src/pcf/pcfutil.c
+++ b/src/pcf/pcfutil.c
@@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group.
/* Utility functions for reformatting font bitmaps */
- static unsigned char _reverse_byte[0x100] =
+ static const unsigned char _reverse_byte[0x100] =
{
0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
@@ -75,7 +75,7 @@ in this Software without prior written authorization from The Open Group.
void BitOrderInvert( unsigned char* buf,
int nbytes )
{
- unsigned char* rev = _reverse_byte;
+ const unsigned char* rev = _reverse_byte;
for ( ; --nbytes >= 0; buf++ )
diff --git a/src/psnames/pstables.h b/src/psnames/pstables.h
index 7355afc..9fbe50b 100644
--- a/src/psnames/pstables.h
+++ b/src/psnames/pstables.h
@@ -19,7 +19,7 @@
/* this file has been generated automatically -- do not edit! */
- static const char* standard_glyph_names[] =
+ static const char* const standard_glyph_names[] =
{
".null",
"CR",
@@ -1094,7 +1094,8 @@
};
- static const char** t1_standard_glyphs = standard_glyph_names + 31;
+ static const char* const * const t1_standard_glyphs =
+ standard_glyph_names + 31;
#define NUM_STD_GLYPHS 391
diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c
index ec514cb..7bb6516 100644
--- a/src/type1/t1gload.c
+++ b/src/type1/t1gload.c
@@ -297,8 +297,8 @@
metrics->horiBearingY = cbox.yMax;
}
- /* set control data to the glyph charstrings. Note that this is */
- /* _not_ 0 terminated.. */
+ /* Set control data to the glyph charstrings. Note that this is */
+ /* _not_ zero-terminated. */
glyph->root.control_data = type1->charstrings [glyph_index];
glyph->root.control_len = type1->charstrings_len[glyph_index];
}