diff options
| author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2018-11-03 23:00:36 -0400 |
|---|---|---|
| committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2018-11-03 23:00:36 -0400 |
| commit | 547f82f20eb52e4421675e1f41c839091f16fd95 (patch) | |
| tree | 8077ca70b3ddbe0ed29fc5f9101cac98a8798345 | |
| parent | ce3feb0b9d71680cc6aec032ca304585958237d1 (diff) | |
| download | freetype2-547f82f20eb52e4421675e1f41c839091f16fd95.tar.gz | |
* src/truetype/ttgxvar.c (ft_var_apply_tuple): Tracing tweaks.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/truetype/ttgxvar.c | 33 |
2 files changed, 14 insertions, 23 deletions
@@ -1,5 +1,9 @@ 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> + Revert due to specs: [truetype] Speed up variation IUP. 2018-11-02 Alexei Podtelezhnikov <apodtele@gmail.com> diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c index c064fd9e1..15b07ba1e 100644 --- a/src/truetype/ttgxvar.c +++ b/src/truetype/ttgxvar.c @@ -1652,13 +1652,8 @@ 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 )); - 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 */ /* to check against start/end -- the documentation says we don't. */ @@ -1667,7 +1662,7 @@ if ( tuple_coords[i] == 0 ) { - FT_TRACE6(( " tuple coordinate is zero, ignored\n", i )); + FT_TRACE6(( " tuple coordinate is zero, ignore\n", i )); continue; } @@ -1680,7 +1675,7 @@ 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 )); /* `apply' does not change */ continue; @@ -1693,13 +1688,13 @@ if ( blend->normalizedcoords[i] < FT_MIN( 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 )); apply = 0; break; } - FT_TRACE6(( " tuple coordinate value %.5f fits\n", + FT_TRACE6(( " tuple coordinate %.5f fits\n", tuple_coords[i] / 65536.0 )); apply = FT_MulDiv( apply, blend->normalizedcoords[i], @@ -1712,7 +1707,7 @@ if ( blend->normalizedcoords[i] < im_start_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", im_start_coords[i] / 65536.0, im_end_coords[i] / 65536.0 )); @@ -1720,25 +1715,17 @@ break; } - else if ( blend->normalizedcoords[i] < tuple_coords[i] ) - { - FT_TRACE6(( " intermediate tuple range [%.5f;%.5f] fits\n", - im_start_coords[i] / 65536.0, - im_end_coords[i] / 65536.0 )); + FT_TRACE6(( " intermediate tuple range (%.5f;%.5f) fits\n", + im_start_coords[i] / 65536.0, + im_end_coords[i] / 65536.0 )); + if ( blend->normalizedcoords[i] < tuple_coords[i] ) apply = FT_MulDiv( apply, blend->normalizedcoords[i] - im_start_coords[i], tuple_coords[i] - im_start_coords[i] ); - } - 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, im_end_coords[i] - blend->normalizedcoords[i], im_end_coords[i] - tuple_coords[i] ); - } } } |