summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/vnc/qvncclient.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-01-12 14:27:38 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-01-13 23:49:46 +0000
commit3b1cb25eb026e3a85d616df0b9ed20d508468694 (patch)
tree81c8563d5ab98be48879e3cf448595594de0d497 /src/plugins/platforms/vnc/qvncclient.cpp
parente15d63baa34a586084f826093d6fd76278f5946d (diff)
Fix VNC format conversion
Pass the right from depth to the conversion function, and set the right format before creating the compositor image for RGB16 support. Fixes: QTBUG-85621 Change-Id: I76f46a3c2d8f1d2b040b790035dbdb0a960ff1a7 Reviewed-by: Andy Nichols <andy.nichols@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 47c6b5b91e0d1271075d98ded5aa7a25296b5ee3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/plugins/platforms/vnc/qvncclient.cpp')
-rw-r--r--src/plugins/platforms/vnc/qvncclient.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/platforms/vnc/qvncclient.cpp b/src/plugins/platforms/vnc/qvncclient.cpp
index ba0ef90891..3d0c1e48c3 100644
--- a/src/plugins/platforms/vnc/qvncclient.cpp
+++ b/src/plugins/platforms/vnc/qvncclient.cpp
@@ -97,10 +97,8 @@ void QVncClient::setDirty(const QRegion &region)
}
}
-void QVncClient::convertPixels(char *dst, const char *src, int count) const
+void QVncClient::convertPixels(char *dst, const char *src, int count, int screendepth) const
{
- const int screendepth = m_server->screen()->depth();
-
// cutoffs
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
if (!m_swapBytes)