image: Simplify baseline handling
authorMatthias Clasen <mclasen@redhat.com>
Thu, 27 Apr 2023 20:19:01 +0000 (22:19 +0200)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 28 Apr 2023 13:12:22 +0000 (09:12 -0400)
We guarantee that the out arguments of the measure
vfunc are non-NULL, no need to check.

gtk/gtkimage.c

index bf3f6a1e07dbc92f8be5704f428207887a36fbd0..7cc98f17d940ed8f5772a0d5e78755bde94054dc 100644 (file)
@@ -1168,10 +1168,8 @@ gtk_image_measure (GtkWidget      *widget,
   if (orientation == GTK_ORIENTATION_VERTICAL)
     {
       baseline_align = gtk_image_get_baseline_align (GTK_IMAGE (widget));
-      if (minimum_baseline)
-        *minimum_baseline = *minimum * baseline_align;
-      if (natural_baseline)
-        *natural_baseline = *natural * baseline_align;
+      *minimum_baseline = *minimum * baseline_align;
+      *natural_baseline = *natural * baseline_align;
     }
 }