mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
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
This commit is contained in:
parent
e549c193ef
commit
e83103cb96
@ -720,23 +720,23 @@ recompute_x_y_scales(GncDenseCal *dcal)
|
|||||||
* lets us draw larger than our area. */
|
* lets us draw larger than our area. */
|
||||||
denom = 7 * num_cols(dcal);
|
denom = 7 * num_cols(dcal);
|
||||||
g_assert(denom != 0);
|
g_assert(denom != 0);
|
||||||
dcal->x_scale = (gint)((width
|
dcal->x_scale = ((gint)(width
|
||||||
- (dcal->leftPadding * 2)
|
- (dcal->leftPadding * 2)
|
||||||
- (num_cols(dcal) * ((8 * MINOR_BORDER_SIZE)
|
- (num_cols(dcal) * ((8 * MINOR_BORDER_SIZE)
|
||||||
+ dcal->label_width))
|
+ dcal->label_width))
|
||||||
- ((num_cols(dcal)-1) * COL_BORDER_SIZE))
|
- ((num_cols(dcal)-1) * COL_BORDER_SIZE))
|
||||||
/ denom);
|
/ denom);
|
||||||
dcal->x_scale = MAX(dcal->x_scale, dcal->min_x_scale);
|
dcal->x_scale = MAX(dcal->x_scale, dcal->min_x_scale);
|
||||||
|
|
||||||
denom = num_weeks_per_col(dcal);
|
denom = num_weeks_per_col(dcal);
|
||||||
g_assert(denom != 0);
|
g_assert(denom != 0);
|
||||||
dcal->y_scale = (gint)((height
|
dcal->y_scale = ((gint)(height
|
||||||
- (dcal->topPadding * 2)
|
- (dcal->topPadding * 2)
|
||||||
- MINOR_BORDER_SIZE
|
- MINOR_BORDER_SIZE
|
||||||
- dcal->dayLabelHeight
|
- dcal->dayLabelHeight
|
||||||
- (num_weeks_per_col(dcal)-1
|
- (num_weeks_per_col(dcal)-1
|
||||||
* MINOR_BORDER_SIZE))
|
* MINOR_BORDER_SIZE))
|
||||||
/ denom);
|
/ denom);
|
||||||
dcal->y_scale = MAX(dcal->y_scale, dcal->min_y_scale);
|
dcal->y_scale = MAX(dcal->y_scale, dcal->min_y_scale);
|
||||||
|
|
||||||
_gdc_set_cal_min_size_req(dcal);
|
_gdc_set_cal_min_size_req(dcal);
|
||||||
|
Loading…
Reference in New Issue
Block a user