diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2017-03-21 17:07:22 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2017-03-22 11:01:26 +0000 |
| commit | 7d51214b609df7e5ec79b56f0c629e084cb886bc (patch) | |
| tree | 9e8dae6b59e6d383a570a58b668b65fb5db991aa /src/multimedia | |
| parent | 91c405b5d41232f30fdc3dfd432b057849a26734 (diff) | |
| download | qtmultimedia-7d51214b609df7e5ec79b56f0c629e084cb886bc.tar.gz | |
Use qFuzzyCompare() instead of equality on floating-point values
QCamera::FrameRateRange is a struct with two qreal members; its
operator== was comparing the members; which triggered a
-Wfloat-compare that's an error in developer builds. This is what
qFuzzyCompare() takes care of, so use it.
Change-Id: Id45a2a7e9b6ccbf575bdedb5b90889859899bf38
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/camera/qcamera.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index 685298905..aebd1c013 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -262,7 +262,10 @@ QT_WARNING_DISABLE_CLANG("-Wfloat-equal") QT_WARNING_DISABLE_GCC("-Wfloat-equal") Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator==(const QCamera::FrameRateRange &r1, const QCamera::FrameRateRange &r2) Q_DECL_NOTHROW -{ return r1.minimumFrameRate == r2.minimumFrameRate && r1.maximumFrameRate == r2.maximumFrameRate; } +{ + return qFuzzyCompare(r1.minimumFrameRate, r2.minimumFrameRate) + && qFuzzyCompare(r1.maximumFrameRate, r2.maximumFrameRate); +} QT_WARNING_POP |