diff options
| author | Zdeněk Žamberský <zzdevel@seznam.cz> | 2016-06-04 21:17:46 +0200 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-06-05 01:59:04 +0000 |
| commit | b84b3f9f1d8577255a9d83c81277ebc53bcac68d (patch) | |
| tree | a151464401ee4f037c472675801c74c0f0a95333 /ui/qt/color_utils.cpp | |
| parent | bb246f5cc652aa96b43a57fec775865f4de9d6b4 (diff) | |
Qt ui code: fix qreal type problems on ARM platform
fixing problems in qt ui code comming from the fact that qreal type is float on
ARM platform and double on other platforms, which causes build errors on ARM
(not all casts are probably strictly necessary)
Bug: 12483
Change-Id: Ife5e6d3649a7ee1ad4e7eadffe9f4484ff2718de
Reviewed-on: https://code.wireshark.org/review/15723
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt/color_utils.cpp')
| -rw-r--r-- | ui/qt/color_utils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/color_utils.cpp b/ui/qt/color_utils.cpp index cb1bdb7ac6..4f27367393 100644 --- a/ui/qt/color_utils.cpp +++ b/ui/qt/color_utils.cpp @@ -73,7 +73,7 @@ const color_t ColorUtils::toColorT(const QColor color) QRgb ColorUtils::alphaBlend(const QColor &color1, const QColor &color2, qreal alpha) { - alpha = qBound(0.0, alpha, 1.0); + alpha = qBound(qreal(0.0), alpha, qreal(1.0)); int r1 = color1.red() * alpha; int g1 = color1.green() * alpha; |