diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:27:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:30:08 +0100 |
| commit | d3a2d9c96994c56d67467c131b8f080510d1a8fd (patch) | |
| tree | 088c55da965b1fb6bb327b2821afc4755eab8117 /src/multimedia/camera | |
| parent | 256ff7bb1551f6c62c4ac861472ea29f45dbab3a (diff) | |
| parent | 75b4283fb05d07fb8654e031f266e9918f1ae647 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib038c5e3ebb48c0e46569a35d530fa5ceaf06a32
Diffstat (limited to 'src/multimedia/camera')
| -rw-r--r-- | src/multimedia/camera/qcamera.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 4c1c0a924..fd804316c 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -71,17 +71,15 @@ static void qRegisterCameraMetaTypes() Q_CONSTRUCTOR_FUNCTION(qRegisterCameraMetaTypes) -static bool qt_sizeLessThan(const QSize &s1, const QSize &s2) +Q_DECL_CONSTEXPR static bool qt_sizeLessThan(const QSize &s1, const QSize &s2) Q_DECL_NOTHROW { return (s1.width() * s1.height()) < (s2.width() * s2.height()); } -static bool qt_frameRateRangeLessThan(const QCamera::FrameRateRange &s1, const QCamera::FrameRateRange &s2) +Q_DECL_CONSTEXPR static bool qt_frameRateRangeLessThan(const QCamera::FrameRateRange &s1, const QCamera::FrameRateRange &s2) Q_DECL_NOTHROW { - if (s1.maximumFrameRate == s2.maximumFrameRate) - return s1.minimumFrameRate < s2.minimumFrameRate; - - return s1.maximumFrameRate < s2.maximumFrameRate; + return qFuzzyCompare(s1.maximumFrameRate, s2.maximumFrameRate) ? (s1.minimumFrameRate < s2.minimumFrameRate) + : (s1.maximumFrameRate < s2.maximumFrameRate); } /*! |