Remove the scaled pixel buffer classes as they are not used.

There were also reports of them being broken last time we still
made use of them.

3 files changed, 0 insertions, 281 deletions

diff --git a/win/rfb_win32/CMakeLists.txt b/win/rfb_win32/CMakeLists.txt
index 83d7f1c6..b3c7dcef 100644
--- a/win/rfb_win32/CMakeLists.txt
+++ b/win/rfb_win32/CMakeLists.txt
@@ -19,7 +19,6 @@ set(RFB_WIN32_SOURCES
   ProgressControl.cxx
   RegConfig.cxx
   Registry.cxx
-  ScaledDIBSectionBuffer.cxx
   SecurityPage.cxx
   SDisplayCorePolling.cxx
   SDisplayCoreWMHooks.cxx
diff --git a/win/rfb_win32/ScaledDIBSectionBuffer.cxx b/win/rfb_win32/ScaledDIBSectionBuffer.cxx
deleted file mode 100644
index 752cd784..00000000
--- a/win/rfb_win32/ScaledDIBSectionBuffer.cxx
+++ /dev/null
@@ -1,195 +0,0 @@
-/* Copyright (C) 2006 TightVNC Team.  All Rights Reserved.
- *    
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- *
- * 
- *
- */
-
-// -=- ScaledDIBSectionBuffer.cxx
-
-#include <math.h>
-
-#include <rfb_win32/ScaledDIBSectionBuffer.h>
-
-using namespace rfb;
-using namespace win32;
-
-const PixelFormat RGB24(32, 24, 0, 1, 255, 255, 255, 16, 8, 0);
-
-ScaledDIBSectionBuffer::ScaledDIBSectionBuffer(HWND window) 
-  : DIBSectionBuffer(window), src_buffer(0), scaling(false) {
-  scaled_data = &data;
-}
-
-ScaledDIBSectionBuffer::~ScaledDIBSectionBuffer() {
-  if (src_buffer) delete src_buffer;
-}
-
-void ScaledDIBSectionBuffer::setScale(int scale_) {
-  if (scale == scale_ || scale_ <= 0) return;
-  if (!(getPixelFormat().trueColour) && scale_ != 100) throw rfb::UnsupportedPixelFormatException();
-  ScaledPixelBuffer::setScale(scale_);
-  if (scale == 100) scaling = false;
-  else scaling = true;
-  recreateBuffers();
-}
-
-void ScaledDIBSectionBuffer::setPF(const PixelFormat &pf_) {
-  if (memcmp(&(ScaledPixelBuffer::pf), &pf_, sizeof(pf_)) == 0) return;
-
-  if (!pf_.trueColour && isScaling()) throw rfb::UnsupportedPixelFormatException();
-
-  pf = pf_;
-  if (scaling) {
-    if (src_buffer) {
-      src_buffer->setPF(pf);
-    } else {
-      src_buffer = new ManagedPixelBuffer(pf, src_width, src_height);
-      src_data = &(src_buffer->data);
-    }
-    if (memcmp(&(DIBSectionBuffer::getPF()), &RGB24, sizeof(PixelFormat)) != 0) {
-      DIBSectionBuffer::setPF(RGB24);
-    }
-  } else {
-    DIBSectionBuffer::setPF(pf);
-    pf = format;
-  }
-}
-
-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_;
-  
-  // FIXME:
-  // Calculate the scale weight tabs must be in the ScalePixelBuffer class
-  recreateRowAccum();
-  freeWeightTabs();
-  calculateScaledBufferSize();
-  scaleFilters.makeWeightTabs(scaleFilterID, src_width, scaled_width, &xWeightTabs);
-  scaleFilters.makeWeightTabs(scaleFilterID, src_height, scaled_height, &yWeightTabs);
-
-  recreateBuffers();
-}
-
-void ScaledDIBSectionBuffer::setScaleWindowSize(int width, int height) {
-  if (scaled_width == width && scaled_height == height) return;
-
-  freeWeightTabs();
-
-  scaled_width = width_ = width;
-  scaled_height = height_ = height;
-
-  if (scaled_width == src_width && scaled_height == src_height) scaling = false;
-  else scaling = true;
-  scale_ratio_x = (double)scaled_width / src_width;
-  scale_ratio_y = (double)scaled_height / src_height;
-  scale = (int)(scale_ratio_x * 100);
-  
-  // FIXME:
-  // Calculate the scale weight tabs must be in the ScalePixelBuffer class
-  scaleFilters.makeWeightTabs(scaleFilterID, src_width, scaled_width, &xWeightTabs);
-  scaleFilters.makeWeightTabs(scaleFilterID, src_height, scaled_height, &yWeightTabs);
-
-  recreateBuffers();
-}
-
-void ScaledDIBSectionBuffer::recreateScaledBuffer() {
-  if (scaling && memcmp(&(DIBSectionBuffer::getPF()), &RGB24, sizeof(PixelFormat)) != 0) {
-    DIBSectionBuffer::setPF(RGB24);
-  } else if (!scaling && (memcmp(&(DIBSectionBuffer::getPF()), &pf, sizeof(PixelFormat)) != 0)){
-    DIBSectionBuffer::setPF(pf);
-  } else {
-    DIBSectionBuffer::recreateBuffer();
-  }
-}
-
-void ScaledDIBSectionBuffer::recreateBuffers() {
-  // Recreate the source pixel buffer
-  if (src_width && src_height && pf.depth > 0) {
-    if (scaling) {
-      if (src_buffer) { 
-        if (src_buffer->width() != src_width || src_buffer->width() != src_height)
-          src_buffer->setSize(src_width, src_height);
-      } else {
-        src_buffer = new ManagedPixelBuffer(pf, src_width, src_height);
-        src_data = &(src_buffer->data);
-        if (data) memcpy(src_buffer->data, data, src_width * src_height * (getPF().bpp/8));
-      }
-    }
-  }
-  // Recreate the scaled pixel buffer
-  recreateScaledBuffer();
-  if (scaling && src_buffer && data) scaleRect(Rect(0, 0, src_width, src_height));
-  else if (!scaling && src_buffer) {
-    if (src_buffer->data && data) memcpy(data, src_buffer->data, src_buffer->area() * (getPF().bpp/8));
-    delete src_buffer;
-    src_buffer = 0;
-    src_data = 0;
-  }
-}
-
-void ScaledDIBSectionBuffer::calculateScaledBufferSize() {
-  ScaledPixelBuffer::calculateScaledBufferSize();
-  width_ = scaled_width;
-  height_ = scaled_height;
-}
-
-void ScaledDIBSectionBuffer::fillRect(const Rect &dest, Pixel pix) {
-  if (scaling) {
-    src_buffer->fillRect(dest, pix);
-    scaleRect(dest);
-  } else {
-    DIBSectionBuffer::fillRect(dest, pix);
-  }
-}
-
-void ScaledDIBSectionBuffer::imageRect(const Rect &dest, const void* pixels, int stride) {
-  if (scaling) {
-    src_buffer->imageRect(dest, pixels, stride);
-    scaleRect(dest);
-  } else {
-    DIBSectionBuffer::imageRect(dest, pixels, stride);
-  }
-}
-
-void ScaledDIBSectionBuffer::copyRect(const Rect &dest, const Point &move_by_delta) {
-  if (scaling) {
-    src_buffer->copyRect(dest, move_by_delta);
-    scaleRect(dest);
-  } else {
-    DIBSectionBuffer::copyRect(dest, move_by_delta);
-  }
-}
-      
-void ScaledDIBSectionBuffer::maskRect(const Rect& r, const void* pixels, const void* mask_) {
-  if (scaling) {
-    src_buffer->maskRect(r, pixels, mask_);
-    scaleRect(r);
-  } else {
-    DIBSectionBuffer::maskRect(r, pixels, mask_);
-  }
-}
-
-void ScaledDIBSectionBuffer::maskRect(const Rect& r, Pixel pixel, const void* mask_) {
-  if (scaling) {
-    src_buffer->maskRect(r, pixel, mask_);
-    scaleRect(r);
-  } else {
-    DIBSectionBuffer::maskRect(r, pixel, mask_);
-  }
-}
diff --git a/win/rfb_win32/ScaledDIBSectionBuffer.h b/win/rfb_win32/ScaledDIBSectionBuffer.h
deleted file mode 100644
index 420a97ab..00000000
--- a/win/rfb_win32/ScaledDIBSectionBuffer.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright (C) 2006 TightVNC Team.  All Rights Reserved.
- *    
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
- * USA.
- *
- * 
- *
- */
-
-// -=- ScaledDIBSectionBuffer.h
-
-#ifndef __RFB_WIN32_SCALED_DIB_SECTION_BUFFER_H__
-#define __RFB_WIN32_SCALED_DIB_SECTION_BUFFER_H__
-
-#include <rfb/ScaledPixelBuffer.h>
-
-#include <rfb_win32/DIBSectionBuffer.h>
-
-namespace rfb {
-
-  namespace win32 {
-
-    //
-    // -=- ScaledDIBSectionBuffer
-    //
-
-    class ScaledDIBSectionBuffer : public ScaledPixelBuffer, public DIBSectionBuffer {
-    public:
-      ScaledDIBSectionBuffer(HWND window);
-      virtual ~ScaledDIBSectionBuffer();
-
-      int width()  const { return scaled_width; }
-      int height() const { return scaled_height; }
-      int area() const { return scaled_width * scaled_height; }
-      bool isScaling() const { return scaling; }
-
-      virtual void setPF(const PixelFormat &pf);
-      virtual const PixelFormat& getPixelFormat() const { return pf; }
-      virtual const PixelFormat& getScaledPixelFormat() const { return getPF(); }
-      virtual void setSize(int w, int h);
-      virtual void setScale(int scale);
-      virtual void setScaleWindowSize(int width, int height);
-      
-      virtual void calculateScaledBufferSize();
-
-      Rect getRect() const { return ScaledPixelBuffer::getRect(); }
-      Rect getRect(const Point& pos) const { return ScaledPixelBuffer::getRect(pos); }
-
-      // -=- Overrides basic rendering operations of 
-      //     FullFramePixelBuffer class
-
-      virtual void fillRect(const Rect &dest, Pixel pix);
-      virtual void imageRect(const Rect &dest, const void* pixels, int stride=0);
-      virtual void copyRect(const Rect &dest, const Point &move_by_delta);
-      virtual void maskRect(const Rect& r, const void* pixels, const void* mask_);
-      virtual void maskRect(const Rect& r, Pixel pixel, const void* mask_);
-
-    protected:
-      virtual void recreateScaledBuffer();
-      virtual void recreateBuffers();
-      virtual void recreateBuffer() {
-        recreateScaledBuffer();
-      };
-
-      ManagedPixelBuffer *src_buffer;
-      bool scaling;
-    };
-
-  };
-
-};
-
-#endif // __RFB_WIN32_SCALED_DIB_SECTION_BUFFER_H__