shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[truetype] Revert change from 2013-01-22.

FreeType's `height' value is the baseline-to-baseline distance...

* src/truetype/ttobjs.c (tt_size_reset): Undo.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,11 @@

+2013-01-23  Werner Lemberg  <[email protected]>

+

+	[truetype] Revert change from 2013-01-22.

+

+	FreeType's `height' value is the baseline-to-baseline distance...

+

+	* src/truetype/ttobjs.c (tt_size_reset): Undo.

+

 2013-01-23  Alexei Podtelezhnikov  <[email protected]>

 	[base, truetype] New internal FT_Hypot function.

--- a/src/truetype/ttobjs.c

+++ b/src/truetype/ttobjs.c

@@ -1177,12 +1177,11 @@

         FT_PIX_ROUND( FT_MulFix( face->root.ascender, metrics->y_scale ) );

       metrics->descender =

         FT_PIX_ROUND( FT_MulFix( face->root.descender, metrics->y_scale ) );

+      metrics->height =

+        FT_PIX_ROUND( FT_MulFix( face->root.height, metrics->y_scale ) );

       metrics->max_advance =

         FT_PIX_ROUND( FT_MulFix( face->root.max_advance_width,

                                  metrics->x_scale ) );

-

-      /* the height is derived from rounded values */

-      metrics->height = metrics->ascender - metrics->descender;

     }

     /* compute new transformation */