rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[truetype] Avoid code duplication. 

* src/truetype/ttobjs.c (tt_size_run_prep): Scale CVT values in this
function.
(tt_size_ready_bytecode): Updated.
* src/truetype/ttgload.c (tt_loader_init): Updated.
This commit is contained in:
Werner Lemberg 2019-05-16 09:55:16 +02:00
parent 787db7c048
commit 535b687e58
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2019-05-16 Werner Lemberg <wl@gnu.org>
[truetype] Avoid code duplication.
* src/truetype/ttobjs.c (tt_size_run_prep): Scale CVT values in this
function.
(tt_size_ready_bytecode): Updated.
* src/truetype/ttgload.c (tt_loader_init): Updated.
2019-05-13 Jouk Jansen <joukj@hrem.nano.tudelft.nl>
* vms_make.com: Updated. Handle `bzip2' directory, too.

5
src/truetype/ttgload.c
View File

@ -2681,11 +2681,6 @@
if ( reexecute )
{
FT_UInt i;
for ( i = 0; i < size->cvt_size; i++ )
size->cvt[i] = FT_MulFix( face->cvt[i], size->ttmetrics.scale );
error = tt_size_run_prep( size, pedantic );
if ( error )
return error;

24
src/truetype/ttobjs.c
View File

@ -937,8 +937,20 @@
TT_Face face = (TT_Face)size->root.face;
TT_ExecContext exec;
FT_Error error;
FT_UInt i;
/* Scale the cvt values to the new ppem. */
/* By default, we use the y ppem value for scaling. */
FT_TRACE6(( "CVT values:\n" ));
for ( i = 0; i < size->cvt_size; i++ )
{
size->cvt[i] = FT_MulFix( face->cvt[i], size->ttmetrics.scale );
FT_TRACE6(( " %3d: %d (%f)\n",
i, face->cvt[i], size->cvt[i] / 64.0 ));
}
FT_TRACE6(( "\n" ));
exec = size->context;
error = TT_Load_Context( exec, face, size );
@ -1171,20 +1183,8 @@
if ( size->cvt_ready < 0 )
{
FT_UInt i;
TT_Face face = (TT_Face)size->root.face;
/* Scale the cvt values to the new ppem. */
/* By default, we use the y ppem value for scaling. */
FT_TRACE6(( "CVT values:\n" ));
for ( i = 0; i < size->cvt_size; i++ )
{
size->cvt[i] = FT_MulFix( face->cvt[i], size->ttmetrics.scale );
FT_TRACE6(( " %3d: %d (%f)\n",
i, face->cvt[i], size->cvt[i] / 64.0 ));
}
FT_TRACE6(( "\n" ));
/* all twilight points are originally zero */
for ( i = 0; i < (FT_UInt)size->twilight.n_points; i++ )
{