Now implemented manage the scale filters from the vncviewer options dialog.

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

diff --git a/common/rfb/ScaledPixelBuffer.cxx b/common/rfb/ScaledPixelBuffer.cxx
index 35d5d3b161046fc38010385fcfee13c000056609..c30e93de89e5b155b7230609315d2c3fce6b8b91 100644 (file)
--- a/common/rfb/ScaledPixelBuffer.cxx
+++ b/common/rfb/ScaledPixelBuffer.cxx
@@ -91,11 +91,11 @@ void ScaledPixelBuffer::setScaleFilter(unsigned int scaleFilterID_) {
 
   scaleFilterID = scaleFilterID_;
   
-  if (src_width && src_height && scaled_width && scaled_height && pf.depth > 0) {
+  if (src_width && src_height && scaled_width && scaled_height) {
     freeWeightTabs();
     scaleFilters.makeWeightTabs(scaleFilterID, src_width, scaled_width, &xWeightTabs);
     scaleFilters.makeWeightTabs(scaleFilterID, src_height, scaled_height, &yWeightTabs);
-    if (scale != 100) scaleRect(Rect(0, 0, src_width, src_height));
+    if (scale != 100 && pf.depth > 0) scaleRect(Rect(0, 0, src_width, src_height));
   }
 }
 

diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
index 4a9b341a0f82e0f6b402ac36b808b9dadb8f35a2..53a16d06b116be52a002c7b743c2ceb3085f8767 100644 (file)
--- a/win/vncviewer/CConn.cxx
+++ b/win/vncviewer/CConn.cxx
@@ -158,6 +158,7 @@ CConn::applyOptions(CConnOptions& opt) {
     window->setDisableWinKeys(options.disableWinKeys);
     window->setShowToolbar(options.showToolbar);
     window->printScale();
+    window->setDesktopScaleFilter(options.scaleFilter);
     if (options.autoScaling) {
       window->setAutoScaling(true);
     } else {