From 31f6f9993b91c0e83ea59bc1b96f514b2ed63e22 Mon Sep 17 00:00:00 2001 From: ed Date: Wed, 3 Apr 2019 10:10:10 +0100 Subject: [PATCH] Fixed some conversion warnings in the Display coordinate conversion methods --- modules/juce_gui_basics/desktop/juce_Displays.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/juce_gui_basics/desktop/juce_Displays.cpp b/modules/juce_gui_basics/desktop/juce_Displays.cpp index 2158e4c675..3e4c42a9a7 100644 --- a/modules/juce_gui_basics/desktop/juce_Displays.cpp +++ b/modules/juce_gui_basics/desktop/juce_Displays.cpp @@ -116,8 +116,8 @@ Point Displays::physicalToLogical (Point point, const Disp auto globalScale = Desktop::getInstance().getGlobalScaleFactor(); - Point logicalTopLeft (display.totalArea.getX(), display.totalArea.getY()); - Point physicalTopLeft (display.topLeftPhysical.getX(), display.topLeftPhysical.getY()); + Point logicalTopLeft (static_cast (display.totalArea.getX()), static_cast (display.totalArea.getY())); + Point physicalTopLeft (static_cast (display.topLeftPhysical.getX()), static_cast (display.topLeftPhysical.getY())); return ((point - physicalTopLeft) / (display.scale / globalScale)) + (logicalTopLeft * globalScale); } @@ -130,8 +130,8 @@ Point Displays::logicalToPhysical (Point point, const Disp auto globalScale = Desktop::getInstance().getGlobalScaleFactor(); - Point logicalTopLeft (display.totalArea.getX(), display.totalArea.getY()); - Point physicalTopLeft (display.topLeftPhysical.getX(), display.topLeftPhysical.getY()); + Point logicalTopLeft (static_cast (display.totalArea.getX()), static_cast (display.totalArea.getY())); + Point physicalTopLeft (static_cast (display.topLeftPhysical.getX()), static_cast (display.topLeftPhysical.getY())); return ((point - (logicalTopLeft * globalScale)) * (display.scale / globalScale)) + physicalTopLeft; }