ScaledDIBSectionBuffer class improvements:

Copy the pixel data from source buffer to scale buffer
if scale was changed to 100 percent and copy the pixel data
from scaled buffer to source buffer if scale was changed
from 100 percent. It allow refresh the Desktop Window
without sending FramebufferUpdateRequest message and
decrease the network traffic.

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

diff --git a/win/rfb_win32/ScaledDIBSectionBuffer.cxx b/win/rfb_win32/ScaledDIBSectionBuffer.cxx
index bd6b4d37d71ed0bac98344044c04adfe92cedca9..be921f951a5f6bbedf120f9ed5801f9507b548b6 100644 (file)
--- a/win/rfb_win32/ScaledDIBSectionBuffer.cxx
+++ b/win/rfb_win32/ScaledDIBSectionBuffer.cxx
@@ -45,15 +45,23 @@ void ScaledDIBSectionBuffer::setScale(int scale_) {
     if (!src_buffer) {
       src_buffer = new ManagedPixelBuffer(format, src_width, src_height);
       src_data = &(src_buffer->data);
+      memcpy(src_buffer->data, data, area() * (getPF().bpp/8));
     }
   } else {
     scaling = false;
-    if (src_buffer) delete src_buffer;
-    src_buffer = 0;
-    src_data = 0;
   }
   ScaledPixelBuffer::setScale(scale_);
   recreateScaledBuffer();
+  if (scaling) {
+    scaleRect(Rect(0, 0, src_width, src_height));
+  } else {
+    memcpy(data, src_buffer->data, src_buffer->area() * (src_buffer->getPF().bpp/8));
+    if (src_buffer) {
+      delete src_buffer;
+      src_buffer = 0;
+      src_data = 0;
+    }
+  }
 }
 
 void ScaledDIBSectionBuffer::setPF(const PixelFormat &pf_) {