shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

* src/type42/t42objs.c (T42_Face_Init), src/type1/t1objs.c
(T1_Face_Init), src/cid/cidobjs.c (cid_face_init): Fix computation
of underline_position and underline_thickness.

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

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,9 @@

+2004-02-13  Robert Etheridge  <[email protected]>

+

+	* src/type42/t42objs.c (T42_Face_Init), src/type1/t1objs.c

+	(T1_Face_Init), src/cid/cidobjs.c (cid_face_init): Fix computation

+	of underline_position and underline_thickness.

+

 2004-02-12  Werner Lemberg  <[email protected]>

 	* src/base/ftobjs.c (FT_Set_Char_Size): Return immediately if

--- a/src/cid/cidobjs.c

+++ b/src/cid/cidobjs.c

@@ -418,10 +418,8 @@

       root->height    = (FT_Short)(

         ( ( root->ascender - root->descender ) * 12 ) / 10 );

-      root->underline_position =

-        (FT_Short)( info->underline_position >> 16 );

-      root->underline_thickness =

-        (FT_Short)( info->underline_thickness >> 16 );

+      root->underline_position  = (FT_Short)info->underline_position;

+      root->underline_thickness = (FT_Short)info->underline_thickness;

       root->internal->max_points   = 0;

       root->internal->max_contours = 0;

--- a/src/type1/t1objs.c

+++ b/src/type1/t1objs.c

@@ -4,7 +4,7 @@

 /*                                                                         */

 /*    Type 1 objects manager (body).                                       */

 /*                                                                         */

-/*  Copyright 1996-2001, 2002, 2003 by                                     */

+/*  Copyright 1996-2001, 2002, 2003, 2004 by                               */

 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */

 /*                                                                         */

 /*  This file is part of the FreeType project, and may only be used,       */

@@ -431,10 +431,8 @@

       root->max_advance_height = root->height;

-      root->underline_position =

-        (FT_Short)( info->underline_position >> 16 );

-      root->underline_thickness =

-        (FT_Short)( info->underline_thickness >> 16 );

+      root->underline_position  = (FT_Short)info->underline_position;

+      root->underline_thickness = (FT_Short)info->underline_thickness;

       root->internal->max_points   = 0;

       root->internal->max_contours = 0;

--- a/src/type42/t42objs.c

+++ b/src/type42/t42objs.c

@@ -4,7 +4,7 @@

 /*                                                                         */

 /*    Type 42 objects manager (body).                                      */

 /*                                                                         */

-/*  Copyright 2002, 2003 by Roberto Alameda.                               */

+/*  Copyright 2002, 2003, 2004 by Roberto Alameda.                         */

 /*                                                                         */

 /*  This file is part of the FreeType project, and may only be used,       */

 /*  modified, and distributed under the terms of the FreeType project      */

@@ -281,8 +281,8 @@

     root->max_advance_width  = face->ttf_face->max_advance_width;

     root->max_advance_height = face->ttf_face->max_advance_height;

-    root->underline_position  = (FT_Short)( info->underline_position >> 16 );

-    root->underline_thickness = (FT_Short)( info->underline_thickness >> 16 );

+    root->underline_position  = (FT_Short)info->underline_position;

+    root->underline_thickness = (FT_Short)info->underline_thickness;

     root->internal->max_points   = 0;

     root->internal->max_contours = 0;