* src/truetype/ttgxvar.c (ft_var_apply_tuple): Tracing tweaks.
This commit is contained in:
parent
ce3feb0b9d
commit
547f82f20e
|
@ -1,3 +1,7 @@
|
||||||
|
2018-11-03 Alexei Podtelezhnikov <apodtele@gmail.com>
|
||||||
|
|
||||||
|
* src/truetype/ttgxvar.c (ft_var_apply_tuple): Tracing tweaks.
|
||||||
|
|
||||||
2018-11-03 Alexei Podtelezhnikov <apodtele@gmail.com>
|
2018-11-03 Alexei Podtelezhnikov <apodtele@gmail.com>
|
||||||
|
|
||||||
Revert due to specs: [truetype] Speed up variation IUP.
|
Revert due to specs: [truetype] Speed up variation IUP.
|
||||||
|
|
|
@ -1652,13 +1652,8 @@
|
||||||
|
|
||||||
for ( i = 0; i < blend->num_axis; i++ )
|
for ( i = 0; i < blend->num_axis; i++ )
|
||||||
{
|
{
|
||||||
FT_TRACE6(( " axis coordinate %d (%.5f):\n",
|
FT_TRACE6(( " axis %d coordinate %.5f:\n",
|
||||||
i, blend->normalizedcoords[i] / 65536.0 ));
|
i, blend->normalizedcoords[i] / 65536.0 ));
|
||||||
if ( !( tupleIndex & GX_TI_INTERMEDIATE_TUPLE ) )
|
|
||||||
FT_TRACE6(( " intermediate coordinates %d (%.5f, %.5f):\n",
|
|
||||||
i,
|
|
||||||
im_start_coords[i] / 65536.0,
|
|
||||||
im_end_coords[i] / 65536.0 ));
|
|
||||||
|
|
||||||
/* It's not clear why (for intermediate tuples) we don't need */
|
/* It's not clear why (for intermediate tuples) we don't need */
|
||||||
/* to check against start/end -- the documentation says we don't. */
|
/* to check against start/end -- the documentation says we don't. */
|
||||||
|
@ -1667,7 +1662,7 @@
|
||||||
|
|
||||||
if ( tuple_coords[i] == 0 )
|
if ( tuple_coords[i] == 0 )
|
||||||
{
|
{
|
||||||
FT_TRACE6(( " tuple coordinate is zero, ignored\n", i ));
|
FT_TRACE6(( " tuple coordinate is zero, ignore\n", i ));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1680,7 +1675,7 @@
|
||||||
|
|
||||||
if ( blend->normalizedcoords[i] == tuple_coords[i] )
|
if ( blend->normalizedcoords[i] == tuple_coords[i] )
|
||||||
{
|
{
|
||||||
FT_TRACE6(( " tuple coordinate value %.5f fits perfectly\n",
|
FT_TRACE6(( " tuple coordinate %.5f fits perfectly\n",
|
||||||
tuple_coords[i] / 65536.0 ));
|
tuple_coords[i] / 65536.0 ));
|
||||||
/* `apply' does not change */
|
/* `apply' does not change */
|
||||||
continue;
|
continue;
|
||||||
|
@ -1693,13 +1688,13 @@
|
||||||
if ( blend->normalizedcoords[i] < FT_MIN( 0, tuple_coords[i] ) ||
|
if ( blend->normalizedcoords[i] < FT_MIN( 0, tuple_coords[i] ) ||
|
||||||
blend->normalizedcoords[i] > FT_MAX( 0, tuple_coords[i] ) )
|
blend->normalizedcoords[i] > FT_MAX( 0, tuple_coords[i] ) )
|
||||||
{
|
{
|
||||||
FT_TRACE6(( " tuple coordinate value %.5f is exceeded, stop\n",
|
FT_TRACE6(( " tuple coordinate %.5f is exceeded, stop\n",
|
||||||
tuple_coords[i] / 65536.0 ));
|
tuple_coords[i] / 65536.0 ));
|
||||||
apply = 0;
|
apply = 0;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
FT_TRACE6(( " tuple coordinate value %.5f fits\n",
|
FT_TRACE6(( " tuple coordinate %.5f fits\n",
|
||||||
tuple_coords[i] / 65536.0 ));
|
tuple_coords[i] / 65536.0 ));
|
||||||
apply = FT_MulDiv( apply,
|
apply = FT_MulDiv( apply,
|
||||||
blend->normalizedcoords[i],
|
blend->normalizedcoords[i],
|
||||||
|
@ -1712,7 +1707,7 @@
|
||||||
if ( blend->normalizedcoords[i] < im_start_coords[i] ||
|
if ( blend->normalizedcoords[i] < im_start_coords[i] ||
|
||||||
blend->normalizedcoords[i] > im_end_coords[i] )
|
blend->normalizedcoords[i] > im_end_coords[i] )
|
||||||
{
|
{
|
||||||
FT_TRACE6(( " intermediate tuple range [%.5f;%.5f] is exceeded,"
|
FT_TRACE6(( " intermediate tuple range (%.5f;%.5f) is exceeded,"
|
||||||
" stop\n",
|
" stop\n",
|
||||||
im_start_coords[i] / 65536.0,
|
im_start_coords[i] / 65536.0,
|
||||||
im_end_coords[i] / 65536.0 ));
|
im_end_coords[i] / 65536.0 ));
|
||||||
|
@ -1720,25 +1715,17 @@
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
else if ( blend->normalizedcoords[i] < tuple_coords[i] )
|
FT_TRACE6(( " intermediate tuple range (%.5f;%.5f) fits\n",
|
||||||
{
|
im_start_coords[i] / 65536.0,
|
||||||
FT_TRACE6(( " intermediate tuple range [%.5f;%.5f] fits\n",
|
im_end_coords[i] / 65536.0 ));
|
||||||
im_start_coords[i] / 65536.0,
|
if ( blend->normalizedcoords[i] < tuple_coords[i] )
|
||||||
im_end_coords[i] / 65536.0 ));
|
|
||||||
apply = FT_MulDiv( apply,
|
apply = FT_MulDiv( apply,
|
||||||
blend->normalizedcoords[i] - im_start_coords[i],
|
blend->normalizedcoords[i] - im_start_coords[i],
|
||||||
tuple_coords[i] - im_start_coords[i] );
|
tuple_coords[i] - im_start_coords[i] );
|
||||||
}
|
|
||||||
|
|
||||||
else
|
else
|
||||||
{
|
|
||||||
FT_TRACE6(( " intermediate tuple range [%.5f;%.5f] fits\n",
|
|
||||||
im_start_coords[i] / 65536.0,
|
|
||||||
im_end_coords[i] / 65536.0 ));
|
|
||||||
apply = FT_MulDiv( apply,
|
apply = FT_MulDiv( apply,
|
||||||
im_end_coords[i] - blend->normalizedcoords[i],
|
im_end_coords[i] - blend->normalizedcoords[i],
|
||||||
im_end_coords[i] - tuple_coords[i] );
|
im_end_coords[i] - tuple_coords[i] );
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue