From: Yoann Lopes <yoann.lopes@digia.com>
Date: Thu, 19 Sep 2013 11:59:36 +0000 (+0200)
Subject: Android: fix compilation on x86.
X-Git-Tag: upstream/5.2.95+rc1~43
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17480111ed3e98c3d10c2fb9590c3c487e3e952c;p=platform%2Fupstream%2Fqtmultimedia.git

Android: fix compilation on x86.

Task-number: QTBUG-33554
Change-Id: I4da7410d3b77ec6d72a73d3b6ceb7b76bb48d2b7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
---

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());