[truetype] Some variable renamings.
Too much local variables holding different structures were called `metrics'. * src/truetype/ttdriver.c (tt_size_select): s/metrics/size_metrics/. * src/truetype/ttgload.c (tt_get_metrics_incr_overrids, compute_glyph_metrics): s/metrics/incr_metrics/. (load_sbit_image): s/metrics/sbit_metrics/. * src/truetype/ttobjs.c (tt_size_run_fpgm): s/metrics/size_metrics/. (tt_size_init_bytecode): s/metrics/tt_metrics/. (tt_size_reset): s/metrics/size_metrics/.
This commit is contained in:
Werner Lemberg
parent
6342da9a8d
commit
683e3ad936
17
ChangeLog
17
ChangeLog
|
|
@ -1,3 +1,20 @@
|
|||
2017-03-20 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
[truetype] Some variable renamings.
|
||||
|
||||
Too much local variables holding different structures were called
|
||||
`metrics'.
|
||||
|
||||
* src/truetype/ttdriver.c (tt_size_select): s/metrics/size_metrics/.
|
||||
|
||||
* src/truetype/ttgload.c (tt_get_metrics_incr_overrids,
|
||||
compute_glyph_metrics): s/metrics/incr_metrics/.
|
||||
(load_sbit_image): s/metrics/sbit_metrics/.
|
||||
|
||||
* src/truetype/ttobjs.c (tt_size_run_fpgm): s/metrics/size_metrics/.
|
||||
(tt_size_init_bytecode): s/metrics/tt_metrics/.
|
||||
(tt_size_reset): s/metrics/size_metrics/.
|
||||
|
||||
2017-03-20 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
[sfnt] Don't add instances to non-variation fonts.
|
||||
|
|
|
|||
|
|
@ -308,11 +308,13 @@
|
|||
}
|
||||
else
|
||||
{
|
||||
SFNT_Service sfnt = (SFNT_Service)ttface->sfnt;
|
||||
FT_Size_Metrics* metrics = &size->metrics;
|
||||
SFNT_Service sfnt = (SFNT_Service)ttface->sfnt;
|
||||
FT_Size_Metrics* size_metrics = &size->metrics;
|
||||
|
||||
|
||||
error = sfnt->load_strike_metrics( ttface, strike_index, metrics );
|
||||
error = sfnt->load_strike_metrics( ttface,
|
||||
strike_index,
|
||||
size_metrics );
|
||||
if ( error )
|
||||
ttsize->strike_index = 0xFFFFFFFFUL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -194,39 +194,39 @@
|
|||
if ( face->root.internal->incremental_interface &&
|
||||
face->root.internal->incremental_interface->funcs->get_glyph_metrics )
|
||||
{
|
||||
FT_Incremental_MetricsRec metrics;
|
||||
FT_Incremental_MetricsRec incr_metrics;
|
||||
FT_Error error;
|
||||
|
||||
|
||||
metrics.bearing_x = loader->left_bearing;
|
||||
metrics.bearing_y = 0;
|
||||
metrics.advance = loader->advance;
|
||||
metrics.advance_v = 0;
|
||||
incr_metrics.bearing_x = loader->left_bearing;
|
||||
incr_metrics.bearing_y = 0;
|
||||
incr_metrics.advance = loader->advance;
|
||||
incr_metrics.advance_v = 0;
|
||||
|
||||
error = face->root.internal->incremental_interface->funcs->get_glyph_metrics(
|
||||
face->root.internal->incremental_interface->object,
|
||||
glyph_index, FALSE, &metrics );
|
||||
glyph_index, FALSE, &incr_metrics );
|
||||
if ( error )
|
||||
goto Exit;
|
||||
|
||||
left_bearing = (FT_Short)metrics.bearing_x;
|
||||
advance_width = (FT_UShort)metrics.advance;
|
||||
left_bearing = (FT_Short)incr_metrics.bearing_x;
|
||||
advance_width = (FT_UShort)incr_metrics.advance;
|
||||
|
||||
#if 0
|
||||
|
||||
/* GWW: Do I do the same for vertical metrics? */
|
||||
metrics.bearing_x = 0;
|
||||
metrics.bearing_y = loader->top_bearing;
|
||||
metrics.advance = loader->vadvance;
|
||||
incr_metrics.bearing_x = 0;
|
||||
incr_metrics.bearing_y = loader->top_bearing;
|
||||
incr_metrics.advance = loader->vadvance;
|
||||
|
||||
error = face->root.internal->incremental_interface->funcs->get_glyph_metrics(
|
||||
face->root.internal->incremental_interface->object,
|
||||
glyph_index, TRUE, &metrics );
|
||||
glyph_index, TRUE, &incr_metrics );
|
||||
if ( error )
|
||||
goto Exit;
|
||||
|
||||
top_bearing = (FT_Short)metrics.bearing_y;
|
||||
advance_height = (FT_UShort)metrics.advance;
|
||||
top_bearing = (FT_Short)incr_metrics.bearing_y;
|
||||
advance_height = (FT_UShort)incr_metrics.advance;
|
||||
|
||||
#endif /* 0 */
|
||||
|
||||
|
|
@ -2151,7 +2151,7 @@
|
|||
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
||||
{
|
||||
FT_Incremental_InterfaceRec* incr;
|
||||
FT_Incremental_MetricsRec metrics;
|
||||
FT_Incremental_MetricsRec incr_metrics;
|
||||
FT_Error error;
|
||||
|
||||
|
||||
|
|
@ -2161,19 +2161,19 @@
|
|||
/* overriding metrics for this glyph. */
|
||||
if ( incr && incr->funcs->get_glyph_metrics )
|
||||
{
|
||||
metrics.bearing_x = 0;
|
||||
metrics.bearing_y = top;
|
||||
metrics.advance = advance;
|
||||
incr_metrics.bearing_x = 0;
|
||||
incr_metrics.bearing_y = top;
|
||||
incr_metrics.advance = advance;
|
||||
|
||||
error = incr->funcs->get_glyph_metrics( incr->object,
|
||||
glyph_index,
|
||||
TRUE,
|
||||
&metrics );
|
||||
&incr_metrics );
|
||||
if ( error )
|
||||
return error;
|
||||
|
||||
top = metrics.bearing_y;
|
||||
advance = metrics.advance;
|
||||
top = incr_metrics.bearing_y;
|
||||
advance = incr_metrics.advance;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2215,7 +2215,7 @@
|
|||
SFNT_Service sfnt;
|
||||
FT_Stream stream;
|
||||
FT_Error error;
|
||||
TT_SBit_MetricsRec metrics;
|
||||
TT_SBit_MetricsRec sbit_metrics;
|
||||
|
||||
|
||||
face = (TT_Face)glyph->face;
|
||||
|
|
@ -2228,34 +2228,34 @@
|
|||
(FT_UInt)load_flags,
|
||||
stream,
|
||||
&glyph->bitmap,
|
||||
&metrics );
|
||||
&sbit_metrics );
|
||||
if ( !error )
|
||||
{
|
||||
glyph->outline.n_points = 0;
|
||||
glyph->outline.n_contours = 0;
|
||||
|
||||
glyph->metrics.width = (FT_Pos)metrics.width * 64;
|
||||
glyph->metrics.height = (FT_Pos)metrics.height * 64;
|
||||
glyph->metrics.width = (FT_Pos)sbit_metrics.width * 64;
|
||||
glyph->metrics.height = (FT_Pos)sbit_metrics.height * 64;
|
||||
|
||||
glyph->metrics.horiBearingX = (FT_Pos)metrics.horiBearingX * 64;
|
||||
glyph->metrics.horiBearingY = (FT_Pos)metrics.horiBearingY * 64;
|
||||
glyph->metrics.horiAdvance = (FT_Pos)metrics.horiAdvance * 64;
|
||||
glyph->metrics.horiBearingX = (FT_Pos)sbit_metrics.horiBearingX * 64;
|
||||
glyph->metrics.horiBearingY = (FT_Pos)sbit_metrics.horiBearingY * 64;
|
||||
glyph->metrics.horiAdvance = (FT_Pos)sbit_metrics.horiAdvance * 64;
|
||||
|
||||
glyph->metrics.vertBearingX = (FT_Pos)metrics.vertBearingX * 64;
|
||||
glyph->metrics.vertBearingY = (FT_Pos)metrics.vertBearingY * 64;
|
||||
glyph->metrics.vertAdvance = (FT_Pos)metrics.vertAdvance * 64;
|
||||
glyph->metrics.vertBearingX = (FT_Pos)sbit_metrics.vertBearingX * 64;
|
||||
glyph->metrics.vertBearingY = (FT_Pos)sbit_metrics.vertBearingY * 64;
|
||||
glyph->metrics.vertAdvance = (FT_Pos)sbit_metrics.vertAdvance * 64;
|
||||
|
||||
glyph->format = FT_GLYPH_FORMAT_BITMAP;
|
||||
|
||||
if ( load_flags & FT_LOAD_VERTICAL_LAYOUT )
|
||||
{
|
||||
glyph->bitmap_left = metrics.vertBearingX;
|
||||
glyph->bitmap_top = metrics.vertBearingY;
|
||||
glyph->bitmap_left = sbit_metrics.vertBearingX;
|
||||
glyph->bitmap_top = sbit_metrics.vertBearingY;
|
||||
}
|
||||
else
|
||||
{
|
||||
glyph->bitmap_left = metrics.horiBearingX;
|
||||
glyph->bitmap_top = metrics.horiBearingY;
|
||||
glyph->bitmap_left = sbit_metrics.horiBearingX;
|
||||
glyph->bitmap_top = sbit_metrics.horiBearingY;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -792,14 +792,14 @@
|
|||
exec->pedantic_hinting = pedantic;
|
||||
|
||||
{
|
||||
FT_Size_Metrics* metrics = &exec->metrics;
|
||||
TT_Size_Metrics* tt_metrics = &exec->tt_metrics;
|
||||
FT_Size_Metrics* size_metrics = &exec->metrics;
|
||||
TT_Size_Metrics* tt_metrics = &exec->tt_metrics;
|
||||
|
||||
|
||||
metrics->x_ppem = 0;
|
||||
metrics->y_ppem = 0;
|
||||
metrics->x_scale = 0;
|
||||
metrics->y_scale = 0;
|
||||
size_metrics->x_ppem = 0;
|
||||
size_metrics->y_ppem = 0;
|
||||
size_metrics->x_scale = 0;
|
||||
size_metrics->y_scale = 0;
|
||||
|
||||
tt_metrics->ppem = 0;
|
||||
tt_metrics->scale = 0;
|
||||
|
|
@ -1014,17 +1014,17 @@
|
|||
|
||||
/* Set default metrics */
|
||||
{
|
||||
TT_Size_Metrics* metrics = &size->ttmetrics;
|
||||
TT_Size_Metrics* tt_metrics = &size->ttmetrics;
|
||||
|
||||
|
||||
metrics->rotated = FALSE;
|
||||
metrics->stretched = FALSE;
|
||||
tt_metrics->rotated = FALSE;
|
||||
tt_metrics->stretched = FALSE;
|
||||
|
||||
/* set default engine compensation */
|
||||
metrics->compensations[0] = 0; /* gray */
|
||||
metrics->compensations[1] = 0; /* black */
|
||||
metrics->compensations[2] = 0; /* white */
|
||||
metrics->compensations[3] = 0; /* reserved */
|
||||
tt_metrics->compensations[0] = 0; /* gray */
|
||||
tt_metrics->compensations[1] = 0; /* black */
|
||||
tt_metrics->compensations[2] = 0; /* white */
|
||||
tt_metrics->compensations[3] = 0; /* reserved */
|
||||
}
|
||||
|
||||
/* allocate function defs, instruction defs, cvt, and storage area */
|
||||
|
|
@ -1209,7 +1209,7 @@
|
|||
FT_Bool only_height )
|
||||
{
|
||||
TT_Face face;
|
||||
FT_Size_Metrics* metrics;
|
||||
FT_Size_Metrics* size_metrics;
|
||||
|
||||
|
||||
face = (TT_Face)size->root.face;
|
||||
|
|
@ -1220,12 +1220,12 @@
|
|||
|
||||
size->ttmetrics.valid = FALSE;
|
||||
|
||||
metrics = &size->metrics;
|
||||
size_metrics = &size->metrics;
|
||||
|
||||
/* copy the result from base layer */
|
||||
*metrics = size->root.metrics;
|
||||
*size_metrics = size->root.metrics;
|
||||
|
||||
if ( metrics->x_ppem < 1 || metrics->y_ppem < 1 )
|
||||
if ( size_metrics->x_ppem < 1 || size_metrics->y_ppem < 1 )
|
||||
return FT_THROW( Invalid_PPem );
|
||||
|
||||
/* This bit flag, if set, indicates that the ppems must be */
|
||||
|
|
@ -1234,12 +1234,15 @@
|
|||
/* */
|
||||
if ( face->header.Flags & 8 )
|
||||
{
|
||||
metrics->ascender =
|
||||
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 ) );
|
||||
size_metrics->ascender = FT_PIX_ROUND(
|
||||
FT_MulFix( face->root.ascender,
|
||||
size_metrics->y_scale ) );
|
||||
size_metrics->descender = FT_PIX_ROUND(
|
||||
FT_MulFix( face->root.descender,
|
||||
size_metrics->y_scale ) );
|
||||
size_metrics->height = FT_PIX_ROUND(
|
||||
FT_MulFix( face->root.height,
|
||||
size_metrics->y_scale ) );
|
||||
}
|
||||
|
||||
size->ttmetrics.valid = TRUE;
|
||||
|
|
@ -1249,31 +1252,31 @@
|
|||
|
||||
if ( face->header.Flags & 8 )
|
||||
{
|
||||
metrics->x_scale = FT_DivFix( metrics->x_ppem << 6,
|
||||
face->root.units_per_EM );
|
||||
metrics->y_scale = FT_DivFix( metrics->y_ppem << 6,
|
||||
face->root.units_per_EM );
|
||||
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 );
|
||||
|
||||
metrics->max_advance =
|
||||
FT_PIX_ROUND( FT_MulFix( face->root.max_advance_width,
|
||||
metrics->x_scale ) );
|
||||
size_metrics->max_advance = FT_PIX_ROUND(
|
||||
FT_MulFix( face->root.max_advance_width,
|
||||
size_metrics->x_scale ) );
|
||||
}
|
||||
|
||||
/* compute new transformation */
|
||||
if ( metrics->x_ppem >= metrics->y_ppem )
|
||||
if ( size_metrics->x_ppem >= size_metrics->y_ppem )
|
||||
{
|
||||
size->ttmetrics.scale = metrics->x_scale;
|
||||
size->ttmetrics.ppem = metrics->x_ppem;
|
||||
size->ttmetrics.scale = size_metrics->x_scale;
|
||||
size->ttmetrics.ppem = size_metrics->x_ppem;
|
||||
size->ttmetrics.x_ratio = 0x10000L;
|
||||
size->ttmetrics.y_ratio = FT_DivFix( metrics->y_ppem,
|
||||
metrics->x_ppem );
|
||||
size->ttmetrics.y_ratio = FT_DivFix( size_metrics->y_ppem,
|
||||
size_metrics->x_ppem );
|
||||
}
|
||||
else
|
||||
{
|
||||
size->ttmetrics.scale = metrics->y_scale;
|
||||
size->ttmetrics.ppem = metrics->y_ppem;
|
||||
size->ttmetrics.x_ratio = FT_DivFix( metrics->x_ppem,
|
||||
metrics->y_ppem );
|
||||
size->ttmetrics.scale = size_metrics->y_scale;
|
||||
size->ttmetrics.ppem = size_metrics->y_ppem;
|
||||
size->ttmetrics.x_ratio = FT_DivFix( size_metrics->x_ppem,
|
||||
size_metrics->y_ppem );
|
||||
size->ttmetrics.y_ratio = 0x10000L;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue