ref: b5e8c90806d5c1f62657e93eccfe95eac12f1f00
parent: 4ee9b7bab13924f49029edf461f75ae740422cfa
author: Werner Lemberg <[email protected]>
date: Thu Jul 3 09:56:28 EDT 2003
formatting, improving documentation
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -167,9 +167,10 @@
/* FT_Glyph_Metrics */
/* */
/* <Description> */
- /* A structure used to model the metrics of a single glyph. Note */
- /* that values are expressed in 26.6 fractional pixel format or in */
- /* font units, depending on context. */
+ /* A structure used to model the metrics of a single glyph. The */
+ /* values are expressed in 26.6 fractional pixel format; if the flag */
+ /* FT_LOAD_NO_SCALE is used, values are returned in font units */
+ /* instead. */
/* */
/* <Fields> */
/* width :: The glyph's width. */
@@ -1363,13 +1364,15 @@
/* FT_GLYPH_FORMAT_OUTLINE. */
/* */
/* num_subglyphs :: The number of subglyphs in a composite glyph. */
- /* This format is only valid for the composite */
- /* glyph format, that should normally only be */
- /* loaded with the FT_LOAD_NO_RECURSE flag. */
+ /* This field is only valid for the composite */
+ /* glyph format that should normally only be */
+ /* loaded with the FT_LOAD_NO_RECURSE flag. For */
+ /* now this is internal to FreeType. */
/* */
/* subglyphs :: An array of subglyph descriptors for */
/* composite glyphs. There are `num_subglyphs' */
- /* elements in there. */
+ /* elements in there. Currently internal to */
+ /* FreeType. */
/* */
/* control_data :: Certain font drivers can also return the */
/* control data for a given glyph image (e.g. */
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -118,9 +118,9 @@
if ( funcs )
error = funcs->set_scale( (PSH_Globals)size->root.internal,
- size->root.metrics.x_scale,
- size->root.metrics.y_scale,
- 0, 0 );
+ size->root.metrics.x_scale,
+ size->root.metrics.y_scale,
+ 0, 0 );
return error;
}