From 17480111ed3e98c3d10c2fb9590c3c487e3e952c Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 19 Sep 2013 13:59:36 +0200 Subject: [PATCH] Android: fix compilation on x86. Task-number: QTBUG-33554 Change-Id: I4da7410d3b77ec6d72a73d3b6ceb7b76bb48d2b7 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp b/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp index cb785fe..899a3a4 100644 --- a/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp +++ b/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp @@ -239,10 +239,10 @@ void QAndroidCameraFocusControl::updateFocusZones(QCameraFocusZone::FocusZoneSta QSize viewportSize = m_session->camera()->previewSize(); QSizeF focusSize(50.f / viewportSize.width(), 50.f / viewportSize.height()); - float x = qBound(0.f, + float x = qBound(qreal(0), m_actualFocusPoint.x() - (focusSize.width() / 2), 1.f - focusSize.width()); - float y = qBound(0.f, + float y = qBound(qreal(0), m_actualFocusPoint.y() - (focusSize.height() / 2), 1.f - focusSize.height()); -- 2.7.4