diff options
author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-05-19 16:54:05 +0200 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-05-19 15:39:31 +0000 |
commit | 5fab28b58128f6424eca0f63147f384fd916704f (patch) | |
tree | 1e7f7c486520f75f73d84cae7d9b8820e3229ebe /src/plugins/avfoundation/camera/avfcamerazoomcontrol.mm | |
parent | 0df8d83932a8cdc84bbf4dc7b31e2c1767a13844 (diff) | |
download | qtmultimedia-5fab28b58128f6424eca0f63147f384fd916704f.tar.gz |
AVFoundation: fix retrieving maximum camera zoom value.
Maximum zoom value was incorrectly reset to 1.0 when doing the transition
Active -> Loaded -> Active.
Change-Id: I799900b1597637039d6c28d1d694fb6340b10540
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerazoomcontrol.mm')
-rw-r--r-- | src/plugins/avfoundation/camera/avfcamerazoomcontrol.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerazoomcontrol.mm b/src/plugins/avfoundation/camera/avfcamerazoomcontrol.mm index 8206112bb..158073dcf 100644 --- a/src/plugins/avfoundation/camera/avfcamerazoomcontrol.mm +++ b/src/plugins/avfoundation/camera/avfcamerazoomcontrol.mm @@ -128,11 +128,11 @@ void AVFCameraZoomControl::cameraStateChanged() return; } - if (captureDevice.activeFormat.videoMaxZoomFactor > 1. - && !qFuzzyCompare(m_maxZoomFactor, captureDevice.activeFormat.videoMaxZoomFactor)) { - m_maxZoomFactor = captureDevice.activeFormat.videoMaxZoomFactor; - - Q_EMIT maximumDigitalZoomChanged(m_maxZoomFactor); + if (captureDevice.activeFormat.videoMaxZoomFactor > 1.) { + if (!qFuzzyCompare(m_maxZoomFactor, captureDevice.activeFormat.videoMaxZoomFactor)) { + m_maxZoomFactor = captureDevice.activeFormat.videoMaxZoomFactor; + Q_EMIT maximumDigitalZoomChanged(m_maxZoomFactor); + } } else if (!qFuzzyCompare(m_maxZoomFactor, CGFloat(1.))) { m_maxZoomFactor = 1.; |