From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 12 May 2023 13:13:00 +0000 (-0400)
Subject: css: Fix transition of font features
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~269^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4d13c61aafee6e2a2bb8ef3cbec0e63879472b7d;p=gtk4.git

css: Fix transition of font features

If we store ints as values, we better use
g_hash_table_lookup_extended, or zeros will
show up as missing values.
---

diff --git a/gtk/gtkcssfontfeaturesvalue.c b/gtk/gtkcssfontfeaturesvalue.c
index 323af6992d..9b761f4348 100644
--- a/gtk/gtkcssfontfeaturesvalue.c
+++ b/gtk/gtkcssfontfeaturesvalue.c
@@ -75,7 +75,8 @@ gtk_css_value_font_features_equal (const GtkCssValue *value1,
   g_hash_table_iter_init (&iter, value1->features);
   while (g_hash_table_iter_next (&iter, &name, &val1))
     {
-      val2 = g_hash_table_lookup (value2->features, name);
+      if (!g_hash_table_lookup_extended (value2->features, name, NULL, &val2))
+        return FALSE;
 
       if (val1 != val2)
         return FALSE;
@@ -106,11 +107,10 @@ gtk_css_value_font_features_transition (GtkCssValue *start,
   g_hash_table_iter_init (&iter, start->features);
   while (g_hash_table_iter_next (&iter, (gpointer *)&name, (gpointer *)&start_val))
     {
-      end_val = g_hash_table_lookup (end->features, name);
-      if (end_val == NULL)
+      if (!g_hash_table_lookup_extended (end->features, name, NULL, &end_val))
         transition = start_val;
       else
-        transition = progress > 0.5 ? start_val : end_val;
+        transition = progress < 0.5 ? start_val : end_val;
 
       gtk_css_font_features_value_add_feature (result, name, GPOINTER_TO_INT (transition));
     }
@@ -118,8 +118,7 @@ gtk_css_value_font_features_transition (GtkCssValue *start,
   g_hash_table_iter_init (&iter, end->features);
   while (g_hash_table_iter_next (&iter, (gpointer *)&name, (gpointer *)&end_val))
     {
-      start_val = g_hash_table_lookup (start->features, name);
-      if (start_val != NULL)
+      if (g_hash_table_lookup_extended (end->features, name, NULL, &start_val))
         continue;
 
       gtk_css_font_features_value_add_feature (result, name, GPOINTER_TO_INT (end_val));