diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2013-09-19 13:59:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 14:44:17 +0200 |
| commit | 17480111ed3e98c3d10c2fb9590c3c487e3e952c (patch) | |
| tree | b631e625bfe916c3169f9be9a1e46dfd783f7319 /src | |
| parent | b357c55f2dfe44e5c2a2524b93478aecf668ca0a (diff) | |
Android: fix compilation on x86.
Task-number: QTBUG-33554
Change-Id: I4da7410d3b77ec6d72a73d3b6ceb7b76bb48d2b7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp b/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp index cb785fe1e..899a3a499 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()); |