Small ScaledPixelBuffer class improvements.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2098 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/common/rfb/ScaledPixelBuffer.cxx b/common/rfb/ScaledPixelBuffer.cxx
index bc59fb5e9573269b869e9af969e905aa6bae05c9..da624b21621640e4dbcb75b97d915f1e500d3cd9 100644 (file)
--- a/common/rfb/ScaledPixelBuffer.cxx
+++ b/common/rfb/ScaledPixelBuffer.cxx
@@ -84,7 +84,7 @@ void ScaledPixelBuffer::scaleRect(const Rect& r) {
     c1_sub_dy = 1 - dy;
 
     for (int x = changed_rect.tl.x; x < changed_rect.br.x; x++) {
-      ptr = &scaled_data[(x + y*scaled_width) * 4];
+      ptr = &(*scaled_data)[(x + y*scaled_width) * 4];
 
       i = (int)(dx = x / scale_ratio);
       dx -= i;

diff --git a/common/rfb/ScaledPixelBuffer.h b/common/rfb/ScaledPixelBuffer.h
index 710e543535075a6ea5661eb6430fc68d30c777ef..7e2b0f7048e4482f430b746ec7c23693325cdbe5 100644 (file)
--- a/common/rfb/ScaledPixelBuffer.h
+++ b/common/rfb/ScaledPixelBuffer.h
@@ -90,7 +90,7 @@ namespace rfb {
     PixelFormat pf;
     double scale_ratio;
     U8 **src_data;
-    U8 *scaled_data;
+    U8 **scaled_data;
   };
 
 };

diff --git a/win/rfb_win32/ScaledDIBSectionBuffer.cxx b/win/rfb_win32/ScaledDIBSectionBuffer.cxx
index 155de3de0a3226130440b75900e62e47c946cf82..0b7dffd87a1ae5144396e5f2844e5801f6c4df2b 100644 (file)
--- a/win/rfb_win32/ScaledDIBSectionBuffer.cxx
+++ b/win/rfb_win32/ScaledDIBSectionBuffer.cxx
@@ -30,7 +30,7 @@ using namespace win32;
 
 ScaledDIBSectionBuffer::ScaledDIBSectionBuffer(HWND window) 
   : src_buffer(0), scaling(false), DIBSectionBuffer(window) {
-  scaled_data = data;
+  scaled_data = &data;
 }
 
 ScaledDIBSectionBuffer::~ScaledDIBSectionBuffer() {
@@ -61,7 +61,6 @@ void ScaledDIBSectionBuffer::setPF(const PixelFormat &pf_) {
     }
   }
   DIBSectionBuffer::setPF(pf_);
-  scaled_data = data;
 }
 
 void ScaledDIBSectionBuffer::setSize(int src_width_, int src_height_) {
@@ -76,7 +75,6 @@ void ScaledDIBSectionBuffer::setSize(int src_width_, int src_height_) {
 void ScaledDIBSectionBuffer::recreateScaledBuffer() {
   if (width_ && height_ && (format.depth != 0)) {
     DIBSectionBuffer::recreateBuffer();
-    scaled_data = data;
   }
 }