diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:48:33 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:48:33 +0100 |
| commit | bb3872d60975724a50ff910b6dd108d1944db597 (patch) | |
| tree | ce1c96729a1a4691a322b36cfd5429c020403ccc /src/corelib/global/qfloat16.h | |
| parent | b72b5cd76004e54dc00c0f1133f4d59192ef154a (diff) | |
| parent | 8e387e7fa758ded3f0d096dcf5fe13a22521dad7 (diff) | |
Merge 5.10 into 5.10.0
Change-Id: Ibfbaa8ef89cf45b87a2c65f1da4a708e5464f259
Diffstat (limited to 'src/corelib/global/qfloat16.h')
| -rw-r--r-- | src/corelib/global/qfloat16.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h index 10598adb1d..a36852fc22 100644 --- a/src/corelib/global/qfloat16.h +++ b/src/corelib/global/qfloat16.h @@ -121,7 +121,7 @@ inline qfloat16::qfloat16(float f) Q_DECL_NOTHROW __m128i packhalf = _mm_cvtps_ph(packsingle, 0); b16 = _mm_extract_epi16(packhalf, 0); #elif defined (__ARM_FP16_FORMAT_IEEE) - __fp16 f16 = f; + __fp16 f16 = __fp16(f); memcpy(&b16, &f16, sizeof(quint16)); #else quint32 u; |