[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 67ff766: Make MM fonts work (again).
From: |
Werner LEMBERG |
Subject: |
[freetype2] master 67ff766: Make MM fonts work (again). |
Date: |
Thu, 23 Mar 2017 07:41:45 -0400 (EDT) |
branch: master
commit 67ff7664e4cce992764e70cde25381d07377afee
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
Make MM fonts work (again).
* src/base/ftmm.c (FT_Set_Var_Design_Coordinates,
FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): Ignore
return value of `ft_face_get_mvar_service'; instead, check whether a
service is actually returned.
---
ChangeLog | 9 +++++++++
src/base/ftmm.c | 21 +++++++++------------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9e07431..f344092 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-03-23 Werner Lemberg <address@hidden>
+
+ Make MM fonts work (again).
+
+ * src/base/ftmm.c (FT_Set_Var_Design_Coordinates,
+ FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): Ignore
+ return value of `ft_face_get_mvar_service'; instead, check whether a
+ service is actually returned.
+
2017-03-20 Werner Lemberg <address@hidden>
[truetype] Some variable renamings.
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index 6aaa5f8..2cb56a3 100644
--- a/src/base/ftmm.c
+++ b/src/base/ftmm.c
@@ -206,11 +206,10 @@
}
if ( !error )
- error = ft_face_get_mvar_service( face, &service_mvar );
-
- if ( !error )
{
- if ( service_mvar->metrics_adjust )
+ (void)ft_face_get_mvar_service( face, &service_mvar );
+
+ if ( service_mvar && service_mvar->metrics_adjust )
service_mvar->metrics_adjust( face );
}
@@ -279,11 +278,10 @@
}
if ( !error )
- error = ft_face_get_mvar_service( face, &service_mvar );
-
- if ( !error )
{
- if ( service_mvar->metrics_adjust )
+ (void)ft_face_get_mvar_service( face, &service_mvar );
+
+ if ( service_mvar && service_mvar->metrics_adjust )
service_mvar->metrics_adjust( face );
}
@@ -327,11 +325,10 @@
}
if ( !error )
- error = ft_face_get_mvar_service( face, &service_mvar );
-
- if ( !error )
{
- if ( service_mvar->metrics_adjust )
+ (void)ft_face_get_mvar_service( face, &service_mvar );
+
+ if ( service_mvar && service_mvar->metrics_adjust )
service_mvar->metrics_adjust( face );
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 67ff766: Make MM fonts work (again).,
Werner LEMBERG <=