Code refactoring: PollingManager should not know anything about
XPixelBuffer. This commit partially reverts the changes from r2567.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2575 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/unix/x0vncserver/PollingManager.cxx b/unix/x0vncserver/PollingManager.cxx
index 27f1028..9951883 100644
--- a/unix/x0vncserver/PollingManager.cxx
+++ b/unix/x0vncserver/PollingManager.cxx
@@ -43,24 +43,24 @@
//
// Constructor.
//
-// Note that dpy and buffer should remain valid during the object
+// Note that dpy and image should remain valid during the object
// lifetime, while factory is used only in the constructor itself.
//
-PollingManager::PollingManager(Display *dpy, XPixelBuffer *buffer,
+PollingManager::PollingManager(Display *dpy, const Image *image,
ImageFactory *factory,
int offsetLeft, int offsetTop)
: m_dpy(dpy),
- m_image(buffer->getImage()),
- m_bytesPerPixel(buffer->getPF().bpp / 8),
+ m_image(image),
+ m_bytesPerPixel(image->xim->bits_per_pixel / 8),
m_offsetLeft(offsetLeft),
m_offsetTop(offsetTop),
- m_width(buffer->width()),
- m_height(buffer->height()),
- m_widthTiles((buffer->width() + 31) / 32),
- m_heightTiles((buffer->height() + 31) / 32),
- m_numTiles(((buffer->width() + 31) / 32) *
- ((buffer->height() + 31) / 32)),
+ m_width(image->xim->width),
+ m_height(image->xim->height),
+ m_widthTiles((image->xim->width + 31) / 32),
+ m_heightTiles((image->xim->height + 31) / 32),
+ m_numTiles(((image->xim->width + 31) / 32) *
+ ((image->xim->height + 31) / 32)),
m_pollingStep(0)
{
// Create additional images used in polling algorithm, warn if