Commit 1e4496c54c010843c1bac56e5d344115d1a49620
2018-10-31T23:17:33
[truetype] Speed up variation IUP. * src/truetype/ttgxvar.c (tt_delta_interpolate): Separate trivial snapping to the same position from true interpolation.
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 40 41 42 43 44 45 46 47 48
diff --git a/ChangeLog b/ChangeLog
index 2b75088..40eb273 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-10-31 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ [truetype] Speed up variation IUP.
+
+ * src/truetype/ttgxvar.c (tt_delta_interpolate): Separate trivial
+ snapping to the same position from true interpolation.
+
2018-10-31 Alexei Podtelezhnikov <apodtele@gmail.com>
* src/type1/t1load.c (t1_set_mm_blend): Optimized.
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 336fad1..6a45e42 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -3516,10 +3516,25 @@
/* If the reference points have the same coordinate but different */
/* delta, inferred delta is zero. Otherwise interpolate. */
- if ( in1 != in2 || out1 == out2 )
+ if ( in1 == in2 || out1 == out2 )
{
- FT_Fixed scale = in1 != in2 ? FT_DivFix( out2 - out1, in2 - in1 )
- : 0;
+ for ( p = p1; p <= p2; p++ )
+ {
+ out = in_points[p].x;
+
+ if ( out <= in1 )
+ out += d1;
+ else if ( out >= in2 )
+ out += d2;
+ else
+ out = out1;
+
+ out_points[p].x = out;
+ }
+ }
+ else
+ {
+ FT_Fixed scale = FT_DivFix( out2 - out1, in2 - in1 );
for ( p = p1; p <= p2; p++ )