summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2018-07-27 10:44:01 +0200
committerWerner Lemberg <wl@gnu.org>2018-07-27 10:44:01 +0200
commitc9edca8ee986f283e3396c88fb50f9d2b2187b99 (patch)
tree166f40c18c7976d9661dc888f932fdd68d908f99
parentd277bfc985130d897734d747ddf2649452fd3eeb (diff)
downloadfreetype2-c9edca8ee986f283e3396c88fb50f9d2b2187b99.tar.gz
[truetype] Make `TT_Set_MM_Blend' idempotent (#54388).
* src/truetype/ttgxvar.c (tt_set_mm_blend): Correctly set `face->doblend' if the current call to the function yields the same blend coordinates as the previous call.
-rw-r--r--ChangeLog8
-rw-r--r--src/truetype/ttgxvar.c4
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e8fe81e4..382683faf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2018-07-27 Werner Lemberg <wl@gnu.org>
+ [truetype] Make `TT_Set_MM_Blend' idempotent (#54388).
+
+ * src/truetype/ttgxvar.c (tt_set_mm_blend): Correctly set
+ `face->doblend' if the current call to the function yields the same
+ blend coordinates as the previous call.
+
+2018-07-27 Werner Lemberg <wl@gnu.org>
+
[psaux, type1]: More tracing improvements.
* src/psaux/psintrp.c (cf2_interpT2CharString): Trace skipped
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index d143fcefc..3df50d630 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -2555,7 +2555,11 @@
/* return value -1 indicates `no change' */
if ( !have_diff )
+ {
+ face->doblend = TRUE;
+
return -1;
+ }
for ( ; i < mmvar->num_axis; i++ )
{