Commit 98add9e68c172e2c689a420ea3c53bd5c2772b87
2002-09-18T11:32:12
Formatting, minor doc fixes.
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
diff --git a/ChangeLog b/ChangeLog
index c70285d..5785a8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,14 @@
2002-09-17 David Turner <david@freetype.org>
- * include/freetype/freetype.h, include/freetype/ftimage.h,
- include/freetype/ftstroker.h, include/freetype/ftsysio.h,
- include/freetype/ftsysmem.h, include/freetype/ttnameid.h:
- updating the in-source documentation
+ * include/freetype/freetype.h, include/freetype/ftimage.h,
+ include/freetype/ftstroker.h, include/freetype/ftsysio.h,
+ include/freetype/ftsysmem.h, include/freetype/ttnameid.h: Updating
+ the in-source documentation.
- * src/tools/docmaker/tohtml.py: updating the HTML formatter in the
- DocMaker tool
+ * src/tools/docmaker/tohtml.py: Updating the HTML formatter in the
+ DocMaker tool.
- * src/tools/docmaker.py: removing obsolete file
+ * src/tools/docmaker.py: Removed.
2002-09-17 Werner Lemberg <wl@gnu.org>
@@ -63,42 +63,91 @@
2002-09-09 David Turner <david@freetype.org>
- * src/pshinter/pshalgo2.c, src/pshinter/pshalgo3.c: adding fix to
- prevent seg fault when hints are provided in an empty glyph !!
+ * src/pshinter/pshalgo2.c (psh2_glyph_find_strong_points),
+ src/pshinter/pshalgo3.c (psh3_glyph_find_strong_points): Adding fix
+ to prevent seg fault when hints are provided in an empty glyph.
- * src/cache/ftccache.i: fixed a bug that prevented compilation in
- debug mode of template instantiation
+ * src/cache/ftccache.i (GEN_CACHE_LOOKUP) [FT_DEBUG_LEVEL_ERROR]:
+ Removed conditional code. This fixes a bug that prevented
+ compilation in debug mode of template instantiation.
- * include/freetype/ftimage.h: removed incorrect "zft_" definitions
- and updated constants documentation comments
+ * include/freetype/ftimage.h: Removed incorrect "zft_" definitions
+ and updated constants documentation comments.
- * src/cff/cffparse.c: fixed the CFF table loader. It didn't accept
- empty arrays, and this prevented the loading of certain fonts.
+ * src/cff/cffparse.c (cff_parser_run): Fixed the CFF table loader.
+ It didn't accept empty arrays, and this prevented the loading of
+ certain fonts.
- * include/freetype/freetype.h (FT_FaceRec): updating documentation
- comment. The "descender" value is always *negative*, not positive !
+ * include/freetype/freetype.h (FT_FaceRec): Updating documentation
+ comment. The "descender" value is always *negative*, not positive.
2002-09-09 Owen Taylor <owen@redhat.com>
- * src/pcf/pcfdriver.c (PCF_Glyph_Load): fixing incorrect computation
+ * src/pcf/pcfdriver.c (PCF_Glyph_Load): Fixing incorrect computation
of bitmap metrics.
2002-09-08 David Turner <david@freetype.org>
- * src/smooth/ftsmooth.c, src/base/ftobjs.c,
- include/freetype/config/ftmodule.h: updated to correctly support
- sub-pixel rendering
+ Various updates to correctly support sub-pixel rendering.
- * include/freetype/cache/ftcimage.h, include/freetype/cache/ftcsbits.h,
- src/cache/ftcimage.c, src/cache/ftcsbit.c: updated to support sub-pixel
- rendering correctly. Definition of FTC_ImageTypeRec that replaces the
- obsolete FTC_ImageDesc, and has slightly different fields. The
- image type is now determined directly by "load_flags" values.
+ * include/freetype/config/ftmodule.h: Add two renderers for LCD.
- * src/autohint/ahtypes.h, src/autohint/ahhint.c,
- src/pshinter/pshalgo3.c, src/pshinter/pshalgo3.h: various enhancements
- to the automatic and Postscript hinters !! and sub-pixel hinting now
- works correctly (see demo programs)
+ * src/base/ftobjs.c (FT_Load_Glyph): Updated.
+
+ * src/smooth/ftsmooth.c (ft_smooth_render_lcd,
+ ft_smooth_render_lcd_v): Set FT_PIXEL_MODE_LCD and
+ FT_PIXEL_MODE_LCD_V, respectively.
+
+ * include/freetype/cache/ftcimage.h (FTC_ImageTypeRec): New
+ structure.
+ Updated all users.
+ (FTC_ImageDesc): Removed.
+ (FTC_ImageCache_Lookup): Second parameter is now of type
+ `FTC_ImageType'.
+ Updated all users.
+ (FTC_IMAGE_DESC_COMPARE): Updated and renamed to...
+ (FTC_IMAGE_TYPE_COMPARE): This.
+ (FTC_IMAGE_DESC_HASH): Updated and renamed to...
+ (FTC_IMAGE_TYPE_HASH): This.
+
+ * include/freetype/cache/ftcsbits.h (FTC_SBitRec): Field `num_grays'
+ replaced with `max_grays'.
+ `pitch' is now FT_Short.
+ (FTC_SBitCache_Lookup): Second parameter is now of type
+ `FTC_ImageType'.
+ Updated all users.
+
+ * src/cache/ftcimage.c (FTC_ImageQueryRec, FTC_ImageFamilyRec):
+ Updated.
+ (ftc_image_node_init): Updated.
+ Moved code to convert type flags to load flags to...
+ (FTC_Image_Cache_Lookup): This function.
+ (ftc_image_family_init): Updated.
+
+ * src/cache/ftcsbit.c (FTC_SBitQueryRec, FTC_SBitFamilyRec):
+ Updated.
+ (ftc_sbit_node_load): Updated.
+ Moved code to convert type flags to load flags to...
+ (FTC_SBitCache_Lookup): This function.
+
+ * src/autohint/ahtypes.h (AH_HinterRec): Replace `no_*_hints' with
+ `do_*_snapping'.
+ Update all users (with negation).
+ * src/autohint/ahhint.c (ah_compute_stem_width): Fix threshold for
+ `dist' for `delta' < 40.
+
+ * src/pshinter/pshalgo3.h (PSH3_GlyphRec): Replace `no_*_hints' with
+ `do_*_snapping'.
+ Update all users (with negation).
+ * src/pshinter/pshalgo3.c (psh3_dimension_quantize_len): New
+ function.
+ (psh3_hint_align): Use it.
+ Improve hinting code.
+ [STRONGER]: Removed.
+ (STRONGER): Removed.
+
+ * include/freetype/freetype.h (FT_Set_Hint_Flags, FT_HINT_*):
+ Removed.
2002-09-05 Werner Lemberg <wl@gnu.org>
diff --git a/docs/CHANGES b/docs/CHANGES
index 4ff9970..fda9b86 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -24,42 +24,47 @@ LATEST CHANGES BETWEEN 2.1.3 and 2.1.2
- The computation of bearings in the BDF driver has been fixed.
- - The Postscript hinter did crash when trying to hint certain glyphs
- (more precisely, when trying to apply hints to an empty glyph outline !)
+ - The Postscript hinter crashed when trying to hint certain glyphs (more
+ precisely, when trying to apply hints to an empty glyph outline).
- The TrueType glyph loader now supports composites in "Apple format"
(they differ slightly from Microsoft/OpenType ones in the way transform
- offsets are computed...)
+ offsets are computed).
+
II. MISCELLANEOUS
- The automatic and postscript hinters have both been updated. This
results in a relatively important increase of rendering quality since
- many nasty defaults have been supressed. Please visit the web page:
+ many nasty defaults have been supressed. Please visit the web page:
- http://www.freetype.org/freetype2/smooth-hinting.html
+ http://www.freetype.org/freetype2/smooth-hinting.html
- for additional details on this topic..
+ for additional details on this topic.
- - Added support for the DESTDIR variable during "make install", to make
- packager's life a bit less miserable :-)
+ - Added support for the DESTDIR variable during "make install". This
+ simplifies packaging of FreeType.
- The DocMaker tool used to generate the on-line API reference has been
- completely rewritten. If is now located in "src/tools/docmaker/docmaker.py"
- It now provides:
+ completely rewritten. It is now located in
+ "src/tools/docmaker/docmaker.py". Features:
- better cross-referenced output
- more polished output
- - uses Python regular expressions (though it didn't speed the program)
+ - uses Python regular expressions (though it didn't speed the
+ program)
- much more modular structure, which allows for different "backends"
- in order to generate HTML, XML or whatever format...
-
- one can re-generate the API reference by calling:
+ in order to generate HTML, XML, or whatever format.
- python src/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.1.3
- --output=<outputdirectory> include/freetype/*.h include/freetype/config/*.h
- include/freetype/cache/*.h
+ One can regenerate the API reference by calling:
+ python src/tools/docmaker/docmaker.py \
+ --prefix=ft2 \
+ --title=FreeType-2.1.3 \
+ --output=<outputdirectory>
+ include/freetype/*.h \
+ include/freetype/config/*.h \
+ include/freetype/cache/*.h
- A new, experimental, support for incremental font loading (i.e.,
loading of fonts where the glyphs are not in the font file itself, but
@@ -67,9 +72,9 @@ LATEST CHANGES BETWEEN 2.1.3 and 2.1.2
been added by Graham Asher. This is still work in progress, however.
- A new, experimental, path stroker has been added. It doesn't suffer
- from severe rounding errors, and treat bezier arcs directly. Still
- work in progress (i.e. not part of the official API). See the file
- <freetype/ftstroker.h> for some of the details...
+ from severe rounding errors and treat bezier arcs directly. Still
+ work in progress (i.e. not part of the official API). See the file
+ <freetype/ftstroker.h> for some of the details.
- The massive re-formatting of sources and internal re-design is still
under-way. Many internal functions, constants, and types have been
diff --git a/include/freetype/cache/ftcimage.h b/include/freetype/cache/ftcimage.h
index 041084a..382d991 100644
--- a/include/freetype/cache/ftcimage.h
+++ b/include/freetype/cache/ftcimage.h
@@ -4,7 +4,7 @@
/* */
/* FreeType Image cache (specification). */
/* */
-/* Copyright 2000-2001 by */
+/* Copyright 2000-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -53,24 +53,24 @@ FT_BEGIN_HEADER
/*************************************************************************/
-
-
/**************************************************************************
*
- * @struct: FTC_ImageTypeRec
+ * @struct:
+ * FTC_ImageTypeRec
*
* @description:
- * a simple structure used to describe the type of glyph image to be
- * loaded into the cache
+ * A simple structure used to describe the type of glyph image to be
+ * loaded into the cache.
*
* @fields:
- * font :: An @FTC_FontRec used to describe the glyph's face and size
- * flags :: the load flags to be applied when loading the glyph, see
- * the @FT_LOAD_XXX constants for details
+ * font :: An @FTC_FontRec used to describe the glyph's face and size.
+ *
+ * flags :: The load flags to be applied when loading the glyph; see
+ * the @FT_LOAD_XXX constants for details.
*
* @note:
- * this type completely replaces the @FTC_Image_Desc structure which is
- * now obsolete..
+ * This type completely replaces the @FTC_Image_Desc structure which is
+ * now obsolete.
*/
typedef struct FTC_ImageTypeRec_
{
@@ -85,11 +85,11 @@ FT_BEGIN_HEADER
#define FTC_IMAGE_TYPE_COMPARE( d1, d2 ) \
( FTC_FONT_COMPARE( &(d1)->font, &(d2)->font ) && \
- (d1)->flags == (d2)->flags )
+ (d1)->flags == (d2)->flags )
#define FTC_IMAGE_TYPE_HASH( d ) \
(FT_UFast)( FTC_FONT_HASH( &(d)->font ) ^ \
- ( (d)->flags << 4 ) )
+ ( (d)->flags << 4 ) )
/*************************************************************************/
diff --git a/include/freetype/cache/ftcsbits.h b/include/freetype/cache/ftcsbits.h
index a7f739e..6f8ef99 100644
--- a/include/freetype/cache/ftcsbits.h
+++ b/include/freetype/cache/ftcsbits.h
@@ -4,7 +4,7 @@
/* */
/* A small-bitmap cache (specification). */
/* */
-/* Copyright 2000-2001 by */
+/* Copyright 2000-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -72,7 +72,7 @@ FT_BEGIN_HEADER
/* */
/* format :: The format of the glyph bitmap (monochrome or gray). */
/* */
- /* max_grays :: maximum gray level value, from 1 to 255 */
+ /* max_grays :: Maximum gray level value (in the range 1 to 255). */
/* */
/* pitch :: The number of bytes per bitmap line. May be positive */
/* or negative. */
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 1554df1..812aa56 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -1934,7 +1934,7 @@ FT_BEGIN_HEADER
/* glyph_index :: The index of the glyph in the font file. */
/* */
/* load_flags :: A flag indicating what to load for this glyph. The */
- /* FT_LOAD_XXX constants can be used to control the */
+ /* @FT_LOAD_XXX constants can be used to control the */
/* glyph loading process (e.g., whether the outline */
/* should be scaled, whether to load bitmaps or not, */
/* whether to hint the outline, etc). */
@@ -1975,7 +1975,7 @@ FT_BEGIN_HEADER
/* current charmap used in the face. */
/* */
/* load_flags :: A flag indicating what to load for this glyph. The */
- /* FT_LOAD_XXX constants can be used to control the */
+ /* @FT_LOAD_XXX constants can be used to control the */
/* glyph loading process (e.g., whether the outline */
/* should be scaled, whether to load bitmaps or not, */
/* whether to hint the outline, etc). */
@@ -2002,133 +2002,127 @@ FT_BEGIN_HEADER
FT_Int32 load_flags );
-/****************************************************************************
- *
- * @enum: FT_LOAD_XXX
- *
- * @description:
- * a list of bit-field constants, used with @FT_Load_Glyph to indicate
- * what kind of operations to perform during glyph loading
- *
- * @values:
- * FT_LOAD_DEFAULT ::
- * corresponding to 0, this value is used a default glyph load. In this
- * case, the following will happen:
- *
- * 1/ FreeType will look for a bitmap for the glyph corresponding to
- * the face's current size. If one is found, the function returns.
- * the bitmap data can be accessed from the glyph slot (see note
- * below)
- *
- * 2/ If no embedded bitmap is searched or found, FreeType looks for
- * a scalable outline. If one is found, it is loaded from the font
- * file, scaled to device pixels, then "hinted" to the pixel grid
- * in order to optimize it. the outline data can be accessed from
- * the glyph slot (see note below)
- *
- * Note that by default, the glyph loader doesn't render outlines into
- * bitmaps. the following flags are used to modify this default behaviour
- * to more specific and useful cases.
- *
- * FT_LOAD_NO_SCALE ::
- * indicates that the vector outline being loaded should not be scaled
- * to 26.6 fractional pixels, but kept in font units. Note that this
- * also disables hinting and the loading of embedded bitmaps. You should
- * only use it when you want to retrieve the original glyph outlines
- * in font units.
- *
- * FT_LOAD_NO_HINTING ::
- * indicates that the glyph outlines should not be hinted after their
- * scaling to device pixels. This generally generates "blurrier" glyphs
- * in anti-aliased modes.
- *
- * this flag is ignored if @FT_LOAD_NO_SCALE is set
- *
- * FT_LOAD_RENDER ::
- * indicates that the glyph outline should be rendered immediately into
- * a bitmap before the glyph loader returns. By default, the glyph is
- * rendered for the @FT_RENDER_MODE_NORMAL mode, which corresponds to
- * 8-bit anti-aliased bitmaps using 256 opacity levels. You can use
- * either @FT_LOAD_TARGET_MONO or @FT_LOAD_MONOCHROME to render
- * 1-bit monochrome bitmaps
- *
- * This flag is ignored if @FT_LOAD_NO_SCALE is set
- *
- *
- * FT_LOAD_NO_BITMAP ::
- * indicates that you do not want to look for bitmaps when loading
- * the glyph. Only scalable outlines will be loaded when available,
- * and scaled/hinted/rendered depending on other bit flags
- *
- * this does not prevent you from rendering outlines to bitmaps
- * with @FT_LOAD_RENDER however.
- *
- * FT_LOAD_VERTICAL_LAYOUT ::
- * indicates that the glyph image should be prepared for vertical
- * text layout. This basically means that 'face.glyph.advance' will
- * correspond to the vertical advance height (instead of the default
- * horizontal advance width), and that the glyph image will be
- * translated to match the vertical bearings positions
- *
- * FT_LOAD_FORCE_AUTOHINT ::
- * indicates that you want to force the use of the FreeType auto-hinter
- * when a glyph outline is loaded. You shouldn't need this in a typical
- * application, since it's mostly used to experiment with its algorithm
- *
- * FT_LOAD_CROP_BITMAP ::
- * indicates that the glyph loader should try to crop the bitmap (i.e.
- * remove all space around its black bits) when loading it. This is
- * only useful when loading embedded bitmaps in certain fonts, since
- * bitmaps rendered with @FT_LOAD_RENDER are always cropped by default
- *
- * FT_LOAD_PEDANTIC ::
- * indicates that the glyph loader should perform pedantic verifications
- * during glyph loading. This is mostly used to detect broken glyphs in
- * fonts. By default, FreeType will always try to deal with such cases.
- *
- * FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH ::
- * indicates that the glyph loader should ignore the global advance
- * width defined in the font. As far as we know, this is only used by the
- * X-TrueType font server, in order to deal correctly with the incorrect
- * metrics contained in DynaLab's TrueType CJK fonts.
- *
- * FT_LOAD_NO_RECURSE ::
- * this flag is only used internally. It merely indicates that the glyph
- * loader should not load composite glyphs recursively. Instead, it should
- * set the 'num_subglyph' and 'subglyphs' values of the glyph slot
- * accordingly, and set "glyph->format" to @FT_GLYPH_FORMAT_COMPOSITE
- *
- * the description of sub-glyphs is not available to client applications
- * for now
- *
- * FT_LOAD_IGNORE_TRANSFORM ::
- * indicates that the glyph loader should not try to transform the
- * loaded glyph image. This doesn't prevent scaling/hinting/rendering
- *
- * FT_LOAD_MONOCHROME ::
- * this flag is used with @FT_LOAD_RENDER to indicate that you want
- * to render a 1-bit monochrome glyph bitmap from a vectorial outline.
- *
- * note that this has no effect on the hinting algorithm used by the
- * glyph loader. You'd better use @FT_LOAD_TARGET_MONO if you want to
- * render monochrome-optimized glyph images instead.
- *
- * FT_LOAD_LINEAR_DESIGN ::
- * indicates that the function should return the linearly scaled metrics
- * expressed in original font units, instead of the default 16.16 pixel
- * values
- *
- * FT_LOAD_NO_AUTOHINT ::
- * indicates that the auto-hinter should never be used to hint glyph
- * outlines. This doesn't prevent native format-specific hinters from
- * being used. This can be important for certain fonts where un-hinted
- * output is better than auto-hinted one.
- *
- *
- *
- *
- *
- */
+ /****************************************************************************
+ *
+ * @enum:
+ * FT_LOAD_XXX
+ *
+ * @description:
+ * A list of bit-field constants, used with @FT_Load_Glyph to indicate
+ * what kind of operations to perform during glyph loading.
+ *
+ * @values:
+ * FT_LOAD_DEFAULT ::
+ * Corresponding to 0, this value is used a default glyph load. In this
+ * case, the following will happen:
+ *
+ * 1. FreeType looks for a bitmap for the glyph corresponding to the
+ * face's current size. If one is found, the function returns. The
+ * bitmap data can be accessed from the glyph slot (see note below).
+ *
+ * 2. If no embedded bitmap is searched or found, FreeType looks for a
+ * scalable outline. If one is found, it is loaded from the font
+ * file, scaled to device pixels, then "hinted" to the pixel grid in
+ * order to optimize it. The outline data can be accessed from the
+ * glyph slot (see note below).
+ *
+ * Note that by default, the glyph loader doesn't render outlines into
+ * bitmaps. The following flags are used to modify this default
+ * behaviour to more specific and useful cases.
+ *
+ * FT_LOAD_NO_SCALE ::
+ * Don't scale the vector outline being loaded to 26.6 fractional
+ * pixels, but kept in font units. Note that this also disables
+ * hinting and the loading of embedded bitmaps. You should only use it
+ * when you want to retrieve the original glyph outlines in font units.
+ *
+ * FT_LOAD_NO_HINTING ::
+ * Don't hint glyph outlines after their scaling to device pixels.
+ * This generally generates "blurrier" glyphs in anti-aliased modes.
+ *
+ * This flag is ignored if @FT_LOAD_NO_SCALE is set.
+ *
+ * FT_LOAD_RENDER ::
+ * Render the glyph outline immediately into a bitmap before the glyph
+ * loader returns. By default, the glyph is rendered for the
+ * @FT_RENDER_MODE_NORMAL mode, which corresponds to 8-bit anti-aliased
+ * bitmaps using 256 opacity levels. You can use either
+ * @FT_LOAD_TARGET_MONO or @FT_LOAD_MONOCHROME to render 1-bit
+ * monochrome bitmaps.
+ *
+ * This flag is ignored if @FT_LOAD_NO_SCALE is set.
+ *
+ * FT_LOAD_NO_BITMAP ::
+ * Don't look for bitmaps when loading the glyph. Only scalable
+ * outlines will be loaded when available, and scaled, hinted, or
+ * rendered depending on other bit flags.
+ *
+ * This does not prevent you from rendering outlines to bitmaps
+ * with @FT_LOAD_RENDER, however.
+ *
+ * FT_LOAD_VERTICAL_LAYOUT ::
+ * Prepare the glyph image for vertical text layout. This basically
+ * means that `face.glyph.advance' will correspond to the vertical
+ * advance height (instead of the default horizontal advance width),
+ * and that the glyph image will be translated to match the vertical
+ * bearings positions.
+ *
+ * FT_LOAD_FORCE_AUTOHINT ::
+ * Force the use of the FreeType auto-hinter when a glyph outline is
+ * loaded. You shouldn't need this in a typical application, since it
+ * is mostly used to experiment with its algorithm.
+ *
+ * FT_LOAD_CROP_BITMAP ::
+ * Indicates that the glyph loader should try to crop the bitmap (i.e.,
+ * remove all space around its black bits) when loading it. This is
+ * only useful when loading embedded bitmaps in certain fonts, since
+ * bitmaps rendered with @FT_LOAD_RENDER are always cropped by default.
+ *
+ * FT_LOAD_PEDANTIC ::
+ * Indicates that the glyph loader should perform pedantic
+ * verifications during glyph loading, rejecting invalid fonts. This
+ * is mostly used to detect broken glyphs in fonts. By default,
+ * FreeType tries to handle broken fonts also.
+ *
+ * FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH ::
+ * Indicates that the glyph loader should ignore the global advance
+ * width defined in the font. As far as we know, this is only used by
+ * the X-TrueType font server, in order to deal correctly with the
+ * incorrect metrics contained in DynaLab's TrueType CJK fonts.
+ *
+ * FT_LOAD_NO_RECURSE ::
+ * This flag is only used internally. It merely indicates that the
+ * glyph loader should not load composite glyphs recursively. Instead,
+ * it should set the `num_subglyph' and `subglyphs' values of the glyph
+ * slot accordingly, and set "glyph->format" to
+ * @FT_GLYPH_FORMAT_COMPOSITE.
+ *
+ * The description of sub-glyphs is not available to client
+ * applications for now.
+ *
+ * FT_LOAD_IGNORE_TRANSFORM ::
+ * Indicates that the glyph loader should not try to transform the
+ * loaded glyph image. This doesn't prevent scaling, hinting, or
+ * rendering.
+ *
+ * FT_LOAD_MONOCHROME ::
+ * This flag is used with @FT_LOAD_RENDER to indicate that you want
+ * to render a 1-bit monochrome glyph bitmap from a vectorial outline.
+ *
+ * Note that this has no effect on the hinting algorithm used by the
+ * glyph loader. You should better use @FT_LOAD_TARGET_MONO if you
+ * want to render monochrome-optimized glyph images instead.
+ *
+ * FT_LOAD_LINEAR_DESIGN ::
+ * Return the linearly scaled metrics expressed in original font units
+ * instead of the default 16.16 pixel values.
+ *
+ * FT_LOAD_NO_AUTOHINT ::
+ * Indicates that the auto-hinter should never be used to hint glyph
+ * outlines. This doesn't prevent native format-specific hinters from
+ * being used. This can be important for certain fonts where unhinted
+ * output is better than auto-hinted one.
+ */
#define FT_LOAD_NO_SCALE 0x1
#define FT_LOAD_NO_HINTING 0x2
#define FT_LOAD_RENDER 0x4
diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index 8c88af9..fe46bf5 100644
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -5,7 +5,7 @@
/* FreeType glyph image formats and default raster interface */
/* (specification). */
/* */
-/* Copyright 1996-2001 by */
+/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -429,20 +429,21 @@ FT_BEGIN_HEADER
/*************************************************************************
*
- * @enum: ft_outline_xxx
+ * @enum:
+ * ft_outline_xxx
*
* @description:
- * these constants are deprecated. Please use the corresponding
- * @FT_OUTLINE_XXX values
+ * These constants are deprecated. Please use the corresponding
+ * @FT_OUTLINE_XXX values.
*
* @values:
- * ft_outline_none :: see @FT_OUTLINE_NONE
- * ft_outline_owner :: see @FT_OUTLINE_OWNER
- * ft_outline_even_odd_fill :: see @FT_OUTLINE_EVEN_ODD_FILL
- * ft_outline_reverse_fill :: see @FT_OUTLINE_REVERSE_FILL
- * ft_outline_ignore_dropouts :: see @FT_OUTLINE_IGNORE_DROPOUTS
- * ft_outline_high_precision :: see @FT_OUTLINE_HIGH_PRECISION
- * ft_outline_single_pass :: see @FT_OUTLINE_SINGLE_PASS
+ * ft_outline_none :: See @FT_OUTLINE_NONE.
+ * ft_outline_owner :: See @FT_OUTLINE_OWNER.
+ * ft_outline_even_odd_fill :: See @FT_OUTLINE_EVEN_ODD_FILL.
+ * ft_outline_reverse_fill :: See @FT_OUTLINE_REVERSE_FILL.
+ * ft_outline_ignore_dropouts :: See @FT_OUTLINE_IGNORE_DROPOUTS.
+ * ft_outline_high_precision :: See @FT_OUTLINE_HIGH_PRECISION.
+ * ft_outline_single_pass :: See @FT_OUTLINE_SINGLE_PASS.
*/
#define ft_outline_none FT_OUTLINE_NONE
#define ft_outline_owner FT_OUTLINE_OWNER
diff --git a/include/freetype/ftsysio.h b/include/freetype/ftsysio.h
index f3874db..f8e4954 100644
--- a/include/freetype/ftsysio.h
+++ b/include/freetype/ftsysio.h
@@ -5,7 +5,7 @@
/************************************************************************/
/***** *****/
/***** NOTE: THE CONTENT OF THIS FILE IS NOT CURRENTLY USED *****/
- /***** IN NORMAL BUILDS. CONSIDER IT EXPERIMENTAL *****/
+ /***** IN NORMAL BUILDS. CONSIDER IT EXPERIMENTAL. *****/
/***** *****/
/************************************************************************/
/************************************************************************/
diff --git a/include/freetype/ftsysmem.h b/include/freetype/ftsysmem.h
index 421aaa2..8de0c4d 100644
--- a/include/freetype/ftsysmem.h
+++ b/include/freetype/ftsysmem.h
@@ -9,7 +9,7 @@ FT_BEGIN_HEADER
/************************************************************************/
/***** *****/
/***** NOTE: THE CONTENT OF THIS FILE IS NOT CURRENTLY USED *****/
- /***** IN NORMAL BUILDS. CONSIDER IT EXPERIMENTAL *****/
+ /***** IN NORMAL BUILDS. CONSIDER IT EXPERIMENTAL. *****/
/***** *****/
/************************************************************************/
/************************************************************************/
diff --git a/src/cache/ftcimage.c b/src/cache/ftcimage.c
index 26c9e57..fa1b6ac 100644
--- a/src/cache/ftcimage.c
+++ b/src/cache/ftcimage.c
@@ -110,7 +110,8 @@
&face, &size );
if ( !error )
{
- FT_UInt gindex = FTC_GLYPH_NODE_GINDEX( inode );
+ FT_UInt gindex = FTC_GLYPH_NODE_GINDEX( inode );
+
error = FT_Load_Glyph( face, gindex, ifam->type.flags );
if ( !error )