summaryrefslogtreecommitdiffstats
path: root/unix/xserver/hw/vnc/XserverDesktop.cc
diff options
context:
space:
mode:
Diffstat (limited to 'unix/xserver/hw/vnc/XserverDesktop.cc')
-rw-r--r--unix/xserver/hw/vnc/XserverDesktop.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
index e53dccde..f93cf658 100644
--- a/unix/xserver/hw/vnc/XserverDesktop.cc
+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
@@ -177,7 +177,7 @@ void XserverDesktop::unblockUpdates()
server->unblockUpdates();
}
-void XserverDesktop::setFramebuffer(int w, int h, void* fbptr, int stride)
+void XserverDesktop::setFramebuffer(int w, int h, void* fbptr, int stride_)
{
ScreenSet layout;
@@ -191,12 +191,12 @@ void XserverDesktop::setFramebuffer(int w, int h, void* fbptr, int stride)
if (!fbptr) {
fbptr = new rdr::U8[w * h * (format.bpp/8)];
- stride = w;
+ stride_ = w;
directFbptr = false;
}
data = (rdr::U8*)fbptr;
- stride_ = stride;
+ stride = stride_;
layout = computeScreenLayout();
@@ -1044,11 +1044,6 @@ void XserverDesktop::grabRegion(const rfb::Region& region)
grabbing = false;
}
-int XserverDesktop::getStride() const
-{
- return stride_;
-}
-
void XserverDesktop::keyEvent(rdr::U32 keysym, bool down)
{
if (down)