summaryrefslogtreecommitdiffstats
path: root/common/rfb/Decoder.cxx
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2018-12-10 21:16:07 +0100
committerPierre Ossman <ossman@cendio.se>2018-12-10 21:16:07 +0100
commitd8bbbeb3b37c713a72a113f7ef78741e15cc4a4d (patch)
tree7d8076302c65cf6ffbd2ccbf9d581476412be36b /common/rfb/Decoder.cxx
parent139b96741004adc92032a93b8ef6e5927a618f6d (diff)
parentc3826bb2fcb60efa495b54dd66296bc55ce28ecf (diff)
downloadtigervnc-d8bbbeb3b37c713a72a113f7ef78741e15cc4a4d.tar.gz
tigervnc-d8bbbeb3b37c713a72a113f7ef78741e15cc4a4d.zip
Merge branch 'connparams' of https://github.com/CendioOssman/tigervnc
Diffstat (limited to 'common/rfb/Decoder.cxx')
-rw-r--r--common/rfb/Decoder.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/rfb/Decoder.cxx b/common/rfb/Decoder.cxx
index 370e1f9a..9827a732 100644
--- a/common/rfb/Decoder.cxx
+++ b/common/rfb/Decoder.cxx
@@ -38,7 +38,7 @@ Decoder::~Decoder()
}
void Decoder::getAffectedRegion(const Rect& rect, const void* buffer,
- size_t buflen, const ConnParams& cp,
+ size_t buflen, const ServerParams& server,
Region* region)
{
region->reset(rect);
@@ -47,7 +47,7 @@ void Decoder::getAffectedRegion(const Rect& rect, const void* buffer,
bool Decoder::doRectsConflict(const Rect& rectA, const void* bufferA,
size_t buflenA, const Rect& rectB,
const void* bufferB, size_t buflenB,
- const ConnParams& cp)
+ const ServerParams& server)
{
return false;
}