From 3ddf3056e833affbde37e348691249453aea9641 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Mon, 25 Jun 2018 15:27:39 +0000 Subject: [PATCH] Work with ints when dealing with abs. Fixes a warning. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4121 --- src/hardware/vga_tseng.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/hardware/vga_tseng.cpp b/src/hardware/vga_tseng.cpp index 81e4c2c1..576346a0 100644 --- a/src/hardware/vga_tseng.cpp +++ b/src/hardware/vga_tseng.cpp @@ -352,11 +352,11 @@ void FinishSetMode_ET4K(Bitu crtc_base, VGA_ModeExtraData* modeData) { // Select SVGA clock to get close to 60Hz (not particularly clean implementation) if (modeData->modeNo > 0x13) { - Bitu target = modeData->vtotal*8*modeData->htotal*60; + Bits target = static_cast(modeData->vtotal * 8 * modeData->htotal * 60); Bitu best = 1; - Bits dist = 100000000; - for (Bitu i=0; i<16; i++) { - Bits cdiff=abs((Bits)(target-et4k.clockFreq[i])); + int dist = 100000000; + for (Bitu i = 0; i < 16; i++) { + int cdiff = abs( static_cast(target - static_cast(et4k.clockFreq[i])) ); if (cdiff < dist) { best = i; dist = cdiff; @@ -716,11 +716,11 @@ void FinishSetMode_ET3K(Bitu crtc_base, VGA_ModeExtraData* modeData) { // Select SVGA clock to get close to 60Hz (not particularly clean implementation) if (modeData->modeNo > 0x13) { - Bitu target = modeData->vtotal*8*modeData->htotal*60; + Bits target = static_cast(modeData->vtotal * 8 * modeData->htotal * 60); Bitu best = 1; - Bits dist = 100000000; - for (Bitu i=0; i<8; i++) { - Bits cdiff = abs((Bits)(target-et3k.clockFreq[i])); + int dist = 100000000; + for (Bitu i = 0; i < 8; i++) { + int cdiff = abs( static_cast(target - static_cast(et3k.clockFreq[i])) ); if (cdiff < dist) { best = i; dist = cdiff;