Minor refactoring: new m_bytesPerPixel member variable.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2409 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/unix/x0vncserver/PollingManager.cxx b/unix/x0vncserver/PollingManager.cxx
index 2ce75fa..9ae8d15 100644
--- a/unix/x0vncserver/PollingManager.cxx
+++ b/unix/x0vncserver/PollingManager.cxx
@@ -56,8 +56,14 @@
PollingManager::PollingManager(Display *dpy, Image *image,
ImageFactory *factory,
int offsetLeft, int offsetTop)
- : m_dpy(dpy), m_server(0), m_image(image),
- m_offsetLeft(offsetLeft), m_offsetTop(offsetTop),
+ : m_dpy(dpy),
+ m_server(0),
+ m_image(image),
+ m_bytesPerPixel(image->xim->bits_per_pixel / 8),
+ m_offsetLeft(offsetLeft),
+ m_offsetTop(offsetTop),
+ m_width(image->xim->width),
+ m_height(m_image->xim->height),
m_numVideoPasses(0),
m_pollingStep(0)
{
@@ -248,7 +254,6 @@
int PollingManager::checkRow(int x, int y, int w)
{
- int bytesPerPixel = m_image->xim->bits_per_pixel / 8;
int bytesPerLine = m_image->xim->bytes_per_line;
// If necessary, expand the row to the left, to the tile border.
@@ -274,14 +279,14 @@
// Compute pointers to images to be compared.
// FIXME: Provide an inline function Image::locatePixel(x, y).
- char *ptr_old = m_image->xim->data + y * bytesPerLine + x * bytesPerPixel;
+ char *ptr_old = m_image->xim->data + y * bytesPerLine + x * m_bytesPerPixel;
char *ptr_new = m_rowImage->xim->data;
// Compare pixels, raise corresponding elements of m_changeFlags[].
int nTilesChanged = 0;
for (int i = 0; i < w; i += 32) {
int tile_w = (w - i >= 32) ? 32 : w - i;
- int nBytes = tile_w * bytesPerPixel;
+ int nBytes = tile_w * m_bytesPerPixel;
if (memcmp(ptr_old, ptr_new, nBytes)) {
*pChangeFlags = true;
nTilesChanged++;
@@ -296,8 +301,6 @@
int PollingManager::checkColumn(int x, int y, int h, bool *pChangeFlags)
{
- int bytesPerPixel = m_image->xim->bits_per_pixel / 8;
-
getColumn(x, y, h);
int nTilesChanged = 0;
@@ -309,10 +312,10 @@
// FIXME: Do not compute these pointers in the inner cycle.
char *ptr_old = (m_image->xim->data +
(y + nTile * 32 + i) * m_image->xim->bytes_per_line +
- x * bytesPerPixel);
+ x * m_bytesPerPixel);
char *ptr_new = (m_columnImage->xim->data +
(nTile * 32 + i) * m_columnImage->xim->bytes_per_line);
- if (memcmp(ptr_old, ptr_new, bytesPerPixel)) {
+ if (memcmp(ptr_old, ptr_new, m_bytesPerPixel)) {
*pChangeFlags = true;
nTilesChanged++;
break;
diff --git a/unix/x0vncserver/PollingManager.h b/unix/x0vncserver/PollingManager.h
index 8abf029..25323b5 100644
--- a/unix/x0vncserver/PollingManager.h
+++ b/unix/x0vncserver/PollingManager.h
@@ -64,6 +64,8 @@
VNCServer *m_server;
Image *m_image;
+ int m_bytesPerPixel;
+
int m_offsetLeft;
int m_offsetTop;
int m_width;