ref: 6cef627d172809ad853b11f33322ee0ae80175c0
parent: b770a4ab6d5c66df4d7e534d805fe8a094fc2ce9
author: David Turner <[email protected]>
date: Wed Jun 7 16:06:54 EDT 2000
added code to correctly scale global metrics
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -121,10 +121,29 @@
LOCAL_FUNC
T1_Error T1_Reset_Size( T1_Size size )
{+ /* recompute ascender, descender, etc.. */
+ T1_Face face = (T1_Face)size->root.face;
+ FT_Size_Metrics* metrics = &size->root.metrics;
+
+ if ( metrics->x_ppem < 1 || metrics->y_ppem < 1 )
+ return FT_Err_Invalid_Argument;
+
+ /* Compute root ascender, descender, test height, and max_advance */
+ metrics->ascender = ( FT_MulFix( face->root.ascender,
+ metrics->y_scale ) + 32 ) & -64;
+
+ metrics->descender = ( FT_MulFix( face->root.descender,
+ metrics->y_scale ) + 32 ) & -64;
+
+ metrics->height = ( FT_MulFix( face->root.height,
+ metrics->y_scale ) + 32 ) & -64;
+
+ metrics->max_advance = ( FT_MulFix( face->root.max_advance_width,
+ metrics->x_scale ) + 32 ) & -64;
+
#ifndef T1_CONFIG_OPTION_DISABLE_HINTER
return T1_Reset_Size_Hinter( size );
#else
- (void)size;
return 0;
#endif
}
--- a/src/type1z/t1objs.c
+++ b/src/type1z/t1objs.c
@@ -101,7 +101,25 @@
LOCAL_FUNC
T1_Error T1_Reset_Size( T1_Size size )
{- UNUSED(size);
+ /* recompute ascender, descender, etc.. */
+ T1_Face face = (T1_Face)size->root.face;
+ FT_Size_Metrics* metrics = &size->root.metrics;
+
+ if ( metrics->x_ppem < 1 || metrics->y_ppem < 1 )
+ return FT_Err_Invalid_Argument;
+
+ /* Compute root ascender, descender, test height, and max_advance */
+ metrics->ascender = ( FT_MulFix( face->root.ascender,
+ metrics->y_scale ) + 32 ) & -64;
+
+ metrics->descender = ( FT_MulFix( face->root.descender,
+ metrics->y_scale ) + 32 ) & -64;
+
+ metrics->height = ( FT_MulFix( face->root.height,
+ metrics->y_scale ) + 32 ) & -64;
+
+ metrics->max_advance = ( FT_MulFix( face->root.max_advance_width,
+ metrics->x_scale ) + 32 ) & -64;
return 0;
}