From e83103cb960af0cfb575cb94eac3e69c0485c03a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6hler?= Date: Sun, 27 May 2007 23:18:36 +0000 Subject: [PATCH] Avoid unwanted signed->unsigned conversions in dense cal computations, #441209. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@16132 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnome-utils/gnc-dense-cal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gnome-utils/gnc-dense-cal.c b/src/gnome-utils/gnc-dense-cal.c index 1aae54114d..a2900ab823 100644 --- a/src/gnome-utils/gnc-dense-cal.c +++ b/src/gnome-utils/gnc-dense-cal.c @@ -720,23 +720,23 @@ recompute_x_y_scales(GncDenseCal *dcal) * lets us draw larger than our area. */ denom = 7 * num_cols(dcal); g_assert(denom != 0); - dcal->x_scale = (gint)((width + dcal->x_scale = ((gint)(width - (dcal->leftPadding * 2) - (num_cols(dcal) * ((8 * MINOR_BORDER_SIZE) + dcal->label_width)) - ((num_cols(dcal)-1) * COL_BORDER_SIZE)) - / denom); + / denom); dcal->x_scale = MAX(dcal->x_scale, dcal->min_x_scale); denom = num_weeks_per_col(dcal); g_assert(denom != 0); - dcal->y_scale = (gint)((height + dcal->y_scale = ((gint)(height - (dcal->topPadding * 2) - MINOR_BORDER_SIZE - dcal->dayLabelHeight - (num_weeks_per_col(dcal)-1 * MINOR_BORDER_SIZE)) - / denom); + / denom); dcal->y_scale = MAX(dcal->y_scale, dcal->min_y_scale); _gdc_set_cal_min_size_req(dcal);