From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 27 Apr 2023 20:19:01 +0000 (+0200)
Subject: image: Simplify baseline handling
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~355^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=38ffd099eb8555db99d5539babb632043a752431;p=gtk4.git

image: Simplify baseline handling

We guarantee that the out arguments of the measure
vfunc are non-NULL, no need to check.
---

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index bf3f6a1e07..7cc98f17d9 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -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;
     }
 }