Attachment #183997 for bug #219608

View | Details | Raw Unified | Return to bug 219608 | Differences between

and this patch

Lines 357-362 Link Here

(-)src/truetype/ttdriver.c (+2 lines)
357	if ( FT_IS_SCALABLE( size->face ) )	357	if ( FT_IS_SCALABLE( size->face ) )
358	{	358	{
359	error = tt_size_reset( ttsize, 0 );	359	error = tt_size_reset( ttsize, 0 );
		360	if ( !error )
		361	ttsize->root.metrics = *ttsize->metrics;
360		362
361	#ifdef TT_USE_BYTECODE_INTERPRETER	363	#ifdef TT_USE_BYTECODE_INTERPRETER
362	/* for the `MPS' bytecode instruction we need the point size */	364	/* for the `MPS' bytecode instruction we need the point size */




    /*                                                               */
    if ( face->header.Flags & 8 )
    {
      if ( !only_height )
      {
        size_metrics->x_scale = FT_DivFix( size_metrics->x_ppem << 6,
                                           face->root.units_per_EM );
        size_metrics->y_scale = FT_DivFix( size_metrics->y_ppem << 6,
                                           face->root.units_per_EM );
      }
      /* the TT spec always asks for ROUND, not FLOOR or CEIL */
      size_metrics->ascender = FT_PIX_ROUND(
                                 FT_MulFix( face->root.ascender,

    {
      /* base scaling values on integer ppem values, */
      /* as mandated by the TrueType specification   */
/*
      size_metrics->x_scale = FT_DivFix( size_metrics->x_ppem << 6,
                                         face->root.units_per_EM );
      size_metrics->y_scale = FT_DivFix( size_metrics->y_ppem << 6,
                                         face->root.units_per_EM );
*/
      size_metrics->max_advance = FT_PIX_ROUND(
                                    FT_MulFix( face->root.max_advance_width,
                                               size_metrics->x_scale ) );

Return to bug 219608

Lines 1262-1267 Link Here

(-)src/truetype/ttobjs.c (-1 / +9 lines)
1262	/* */	1262	/* */
1263	if ( face->header.Flags & 8 )	1263	if ( face->header.Flags & 8 )
1264	{	1264	{
		1265	if ( !only_height )
		1266	{
		1267	size_metrics->x_scale = FT_DivFix( size_metrics->x_ppem << 6,
		1268	face->root.units_per_EM );
		1269	size_metrics->y_scale = FT_DivFix( size_metrics->y_ppem << 6,
		1270	face->root.units_per_EM );
		1271	}
1265	/* the TT spec always asks for ROUND, not FLOOR or CEIL */	1272	/* the TT spec always asks for ROUND, not FLOOR or CEIL */
1266	size_metrics->ascender = FT_PIX_ROUND(	1273	size_metrics->ascender = FT_PIX_ROUND(
1267	FT_MulFix( face->root.ascender,	1274	FT_MulFix( face->root.ascender,
Lines 1283-1293 Link Here
1283	{	1290	{
1284	/* base scaling values on integer ppem values, */	1291	/* base scaling values on integer ppem values, */
1285	/* as mandated by the TrueType specification */	1292	/* as mandated by the TrueType specification */
		1293	/*
1286	size_metrics->x_scale = FT_DivFix( size_metrics->x_ppem << 6,	1294	size_metrics->x_scale = FT_DivFix( size_metrics->x_ppem << 6,
1287	face->root.units_per_EM );	1295	face->root.units_per_EM );
1288	size_metrics->y_scale = FT_DivFix( size_metrics->y_ppem << 6,	1296	size_metrics->y_scale = FT_DivFix( size_metrics->y_ppem << 6,
1289	face->root.units_per_EM );	1297	face->root.units_per_EM );
1290		1298	*/
1291	size_metrics->max_advance = FT_PIX_ROUND(	1299	size_metrics->max_advance = FT_PIX_ROUND(
1292	FT_MulFix( face->root.max_advance_width,	1300	FT_MulFix( face->root.max_advance_width,
1293	size_metrics->x_scale ) );	1301	size_metrics->x_scale ) );