Commit 90b14882ec253e12312974e0f6e129497df5ea78
2021-09-22T20:20:04
[bdf, pcf] Minor optimization. * src/pcf/pcfread.c (pcf_load_font): Do not call `FT_MulDiv` for a small job. * src/bdf/bdfdrivr.c (BDF_Face_Init): Ditto. * src/bdf/bdflib.c (_bdf_parse_glyphs): Fix a comment.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
index 5c7b1f5..eb73a7c 100644
--- a/src/bdf/bdfdrivr.c
+++ b/src/bdf/bdfdrivr.c
@@ -487,7 +487,7 @@ THE SOFTWARE.
else
{
/* this is a heuristical value */
- bsize->width = (FT_Short)FT_MulDiv( bsize->height, 2, 3 );
+ bsize->width = ( bsize->height * 2 + 1 ) / 3;
}
prop = bdf_get_font_property( font, "POINT_SIZE" );
diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c
index d2a24dd..eebdbf8 100644
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -1615,7 +1615,7 @@
goto Exit;
}
- /* Expect the DWIDTH (scalable width) field next. */
+ /* Expect the DWIDTH (device width) field next. */
if ( _bdf_strncmp( line, "DWIDTH", 6 ) == 0 )
{
error = _bdf_list_split( &p->list, " +", line, linelen );
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index 0705dad..4c6823a 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -1612,7 +1612,7 @@ THE SOFTWARE.
else
{
/* this is a heuristical value */
- bsize->width = (FT_Short)FT_MulDiv( bsize->height, 2, 3 );
+ bsize->width = ( bsize->height * 2 + 1 ) / 3;
}
prop = pcf_find_property( face, "POINT_SIZE" );