diff options
| -rw-r--r-- | common/rfb/ScaledPixelBuffer.cxx | 4 | ||||
| -rw-r--r-- | win/vncviewer/CConn.cxx | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/common/rfb/ScaledPixelBuffer.cxx b/common/rfb/ScaledPixelBuffer.cxx index 35d5d3b1..c30e93de 100644 --- 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 4a9b341a..53a16d06 100644 --- 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 { |