diff options
author | Andy Nichols <andy.nichols@qt.io> | 2016-06-29 16:56:16 +0200 |
---|---|---|
committer | Andy Nichols <andy.nichols@qt.io> | 2016-06-29 15:00:17 +0000 |
commit | bd03048aa654c0895fd517bbb612c7d2acae8df5 (patch) | |
tree | 629a1f5ae093bda4052ec3aa11c0593399117cd7 /src/plugins/platforms/vnc | |
parent | 5c9e39311757325c82bd5d18789a5caa5297af83 (diff) |
Fix VNC platform plugin building on i386
There was some leftover code that used qt_conv16ToRgb from Qt 4.
Change-Id: If34df00c828ae749d59824ad055e0e82928af9a8
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/plugins/platforms/vnc')
-rw-r--r-- | src/plugins/platforms/vnc/qvncclient.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/plugins/platforms/vnc/qvncclient.cpp b/src/plugins/platforms/vnc/qvncclient.cpp index a932861d87..dae3e83f37 100644 --- a/src/plugins/platforms/vnc/qvncclient.cpp +++ b/src/plugins/platforms/vnc/qvncclient.cpp @@ -122,37 +122,6 @@ void QVncClient::convertPixels(char *dst, const char *src, int count) const return; } } - } else if (screendepth == 16 && m_pixelFormat.bitsPerPixel == 32) { -#if defined(__i386__) // Currently fails on ARM if dst is not 4 byte aligned - const quint32 *src32 = reinterpret_cast<const quint32*>(src); - quint32 *dst32 = reinterpret_cast<quint32*>(dst); - int count32 = count * sizeof(quint16) / sizeof(quint32); - while (count32--) { - const quint32 s = *src32++; - quint32 result1; - quint32 result2; - - // red - result1 = ((s & 0xf8000000) | ((s & 0xe0000000) >> 5)) >> 8; - result2 = ((s & 0x0000f800) | ((s & 0x0000e000) >> 5)) << 8; - - // green - result1 |= ((s & 0x07e00000) | ((s & 0x06000000) >> 6)) >> 11; - result2 |= ((s & 0x000007e0) | ((s & 0x00000600) >> 6)) << 5; - - // blue - result1 |= ((s & 0x001f0000) | ((s & 0x001c0000) >> 5)) >> 13; - result2 |= ((s & 0x0000001f) | ((s & 0x0000001c) >> 5)) << 3; - - *dst32++ = result2; - *dst32++ = result1; - } - if (count & 0x1) { - const quint16 *src16 = reinterpret_cast<const quint16*>(src); - *dst32 = qt_conv16ToRgb(src16[count - 1]); - } - return; -#endif } } |