X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=src%2Fpan-view%2Fpan-item.cc;fp=src%2Fpan-view%2Fpan-item.cc;h=e81fad7e52a87daedd35601a3e930af13b9920fe;hp=bd9450371f72d906a2f06bea4c21af8b1c17b8ca;hb=2a5c2a898b9914fc87818ab79aa98d3e55621b4c;hpb=b7a3426d7badff8ef228c1015d9bbd6c383c81d9

diff --git a/src/pan-view/pan-item.cc b/src/pan-view/pan-item.cc
index bd945037..e81fad7e 100644
--- a/src/pan-view/pan-item.cc
+++ b/src/pan-view/pan-item.cc
@@ -21,6 +21,7 @@
 
 #include "pan-item.h"
 
+#include <algorithm>
 #include <cstring>
 
 #include <glib-object.h>
@@ -108,12 +109,12 @@ void pan_item_size_by_item(PanItem *pi, PanItem *child, gint border)
 		pi->height = child->y + child->height + border - pi->y;
 }
 
-void pan_item_size_coordinates(PanItem *pi, gint border, gint *w, gint *h)
+void pan_item_size_coordinates(PanItem *pi, gint border, gint &w, gint &h)
 {
 	if (!pi) return;
 
-	if (*w < pi->x + pi->width + border) *w = pi->x + pi->width + border;
-	if (*h < pi->y + pi->height + border) *h = pi->y + pi->height + border;
+	w = std::max(w, pi->x + pi->width + border);
+	h = std::max(h, pi->y + pi->height + border);
 }