hrev51957 adds 1 changeset to branch 'master'
old head: 013af6f0eb427b86f4377882814736def25625b8
new head: 54d72f064373dccb98783466e4fc4c672dcfc581
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=54d72f064373+%5E013af6f0eb42
----------------------------------------------------------------------------
54d72f064373: Fix calling abs(unsigned)
Casting the substraction result to int
since call of overloaded 'abs(uint)' is ambiguous.
Change-Id: I24b4919f8a487d275f537391132cae635aaa030e
[ Murai Takashi <tmurai01@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51957
Commit: 54d72f064373dccb98783466e4fc4c672dcfc581
URL: https://git.haiku-os.org/haiku/commit/?id=54d72f064373
Author: Murai Takashi <tmurai01@xxxxxxxxx>
Date: Fri May 18 23:16:21 2018 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Sun May 20 20:29:16 2018 UTC
----------------------------------------------------------------------------
2 files changed, 3 insertions(+), 3 deletions(-)
src/servers/app/Screen.cpp | 2 +-
src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp | 4 ++--
----------------------------------------------------------------------------
diff --git a/src/servers/app/Screen.cpp b/src/servers/app/Screen.cpp
index 0fc58008bd..9ae34015e6 100644
--- a/src/servers/app/Screen.cpp
+++ b/src/servers/app/Screen.cpp
@@ -265,7 +265,7 @@ Screen::_FindBestMode(const display_mode* modes, uint32
count,
// TODO: check if these scores make sense
int32 diff = 1000 * abs(mode.timing.v_display - height)
+ int32(fabs(get_mode_frequency(mode) - frequency) * 10)
- + 100 * abs(mode.space - colorSpace);
+ + 100 * abs((int)(mode.space - colorSpace));
if (bestIndex == -1 || diff < bestDiff) {
bestDiff = diff;
diff --git a/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
b/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
index 13d45e0577..078ce55ad7 100644
--- a/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
+++ b/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
@@ -501,10 +501,10 @@ AccelerantHWInterface::_FindBestMode(const display_mode&
compareMode,
+ abs(mode.timing.h_total * mode.timing.v_total
- compareMode.timing.h_total *
compareMode.timing.v_total)
/ 100
- + abs(mode.timing.pixel_clock -
compareMode.timing.pixel_clock)
+ + abs((int)(mode.timing.pixel_clock -
compareMode.timing.pixel_clock))
/ 100
+ (int32)(500 * fabs(aspectRatio - compareAspectRatio))
- + 100 * abs(mode.space - compareMode.space);
+ + 100 * abs((int)(mode.space - compareMode.space));
if (bestIndex == -1 || diff < bestDiff) {
bestDiff = diff;
