ScaledDIBSectionBuffer class code improvements. Added check

for changing class parameters such as width, height, pf.

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

diff --git a/win/rfb_win32/ScaledDIBSectionBuffer.cxx b/win/rfb_win32/ScaledDIBSectionBuffer.cxx
index 700e90b33da620b2f57b2b5308625a03a59f36c6..df3a6c934ffa2ae6f0d8e8551a2a11b58d553c92 100644 (file)
--- a/win/rfb_win32/ScaledDIBSectionBuffer.cxx
+++ b/win/rfb_win32/ScaledDIBSectionBuffer.cxx
@@ -67,6 +67,8 @@ void ScaledDIBSectionBuffer::setScaleRatio(double scale_ratio_) {
 }
 
 void ScaledDIBSectionBuffer::setPF(const PixelFormat &pf_) {
+  if (memcmp(&getPF(), &pf_, sizeof(pf_)) == 0) return;
+
   if (scaling) {
     ScaledPixelBuffer::setPF(pf_);
     src_buffer->setPF(pf_);
@@ -76,6 +78,8 @@ void ScaledDIBSectionBuffer::setPF(const PixelFormat &pf_) {
 }
 
 void ScaledDIBSectionBuffer::setSize(int src_width_, int src_height_) {
+  if (src_width == src_width_ && src_height == src_height_) return;
+
   src_width = src_width_;
   src_height = src_height_;
   if (scaling) {
@@ -89,8 +93,10 @@ void ScaledDIBSectionBuffer::setSize(int src_width_, int src_height_) {
 void ScaledDIBSectionBuffer::recreateScaledBuffer() {
   width_  = scaled_width;
   height_ = scaled_height;
-  DIBSectionBuffer::recreateBuffer();
-  scaled_data = data;
+  if (width_ && height_ && (format.depth != 0)) {
+    DIBSectionBuffer::recreateBuffer();
+    scaled_data = data;
+  }
 }
 
 void ScaledDIBSectionBuffer::fillRect(const Rect &dest, Pixel pix) {