commit 61d0c547010096e37ced5b8629a0638cceaefddb
author Behdad Esfahbod <behdad@behdad.org> Sat Jul 23 13:25:54 2022 -0600
committer Behdad Esfahbod <behdad@behdad.org> Sat Jul 23 13:26:18 2022 -0600
tree 2b8f6ee6dfc94b3e39d4360f94091217c57b84e5
parent 473a5e5651f36cfade809f78e5322860fe4fc194

[ft] Pass design, not normalized, coords to freetype

Needed for avar2 to work.

src/hb-ft.cc

diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index 0a6db9b..5c88a7f 100644
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -177,15 +177,15 @@
 
 #if defined(HAVE_FT_GET_VAR_BLEND_COORDINATES) && !defined(HB_NO_VAR)
   unsigned int num_coords;
-  const int *coords = hb_font_get_var_coords_normalized (font, &num_coords);
+  const float *coords = hb_font_get_var_coords_design (font, &num_coords);
   if (num_coords)
   {
     FT_Fixed *ft_coords = (FT_Fixed *) hb_calloc (num_coords, sizeof (FT_Fixed));
     if (ft_coords)
     {
       for (unsigned int i = 0; i < num_coords; i++)
-	ft_coords[i] = coords[i] * 4;
-      FT_Set_Var_Blend_Coordinates (ft_face, num_coords, ft_coords);
+	  ft_coords[i] = coords[i] * 65536.f;
+      FT_Set_Var_Design_Coordinates (ft_face, num_coords, ft_coords);
       hb_free (ft_coords);
     }
   }

util/helper-cairo-ft.hh

diff --git a/util/helper-cairo-ft.hh b/util/helper-cairo-ft.hh
index 17de694..5152c7c 100644
--- a/util/helper-cairo-ft.hh
+++ b/util/helper-cairo-ft.hh
@@ -82,15 +82,15 @@
   {
 #if !defined(HB_NO_VAR) && defined(HAVE_FT_SET_VAR_BLEND_COORDINATES)
     unsigned int num_coords;
-    const int *coords = hb_font_get_var_coords_normalized (font_opts->font, &num_coords);
+    const float *coords = hb_font_get_var_coords_design (font_opts->font, &num_coords);
     if (num_coords)
     {
       FT_Fixed *ft_coords = (FT_Fixed *) calloc (num_coords, sizeof (FT_Fixed));
       if (ft_coords)
       {
 	for (unsigned int i = 0; i < num_coords; i++)
-	  ft_coords[i] = coords[i] << 2;
-	FT_Set_Var_Blend_Coordinates (ft_face, num_coords, ft_coords);
+	  ft_coords[i] = coords[i] * 65536.f;
+	FT_Set_Var_Design_Coordinates (ft_face, num_coords, ft_coords);
 	free (ft_coords);
       }
     }