From 694a986e776aed668185123d145060f80fdeb215 Mon Sep 17 00:00:00 2001
From: "Rob Swindell (on Windows 11)" <rob@synchro.net>
Date: Sat, 10 Feb 2024 16:39:52 -0800
Subject: [PATCH] Resolve some MSVC warnings
---
src/conio/bitmap_con.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/conio/bitmap_con.c b/src/conio/bitmap_con.c
index f6eb9b82a2..e11e6306f8 100644
--- a/src/conio/bitmap_con.c
+++ b/src/conio/bitmap_con.c
@@ -1726,7 +1726,7 @@ bitmap_double_mult_inside(int maxwidth, int maxheight)
int
bitmap_largest_mult_inside(int maxwidth, int maxheight)
{
- return bitmap_double_mult_inside(maxwidth, maxheight);
+ return (int)bitmap_double_mult_inside(maxwidth, maxheight);
}
// Must be called with vstatlock
@@ -1736,8 +1736,10 @@ bitmap_get_scaled_win_size(double scale, int *w, int *h, int maxwidth, int maxhe
bool wc = bitmap_width_controls();
double max;
- if (maxwidth == 0 && maxheight == 0)
- return bitmap_get_scaled_win_size_nomax(scale, w, h);
+ if (maxwidth == 0 && maxheight == 0) {
+ bitmap_get_scaled_win_size_nomax(scale, w, h);
+ return;
+ }
if (maxwidth < vstat.scrnwidth)
maxwidth = vstat.scrnwidth;
if (maxheight < vstat.scrnheight)
--
GitLab