From c536139464199fafc93f7ee29e1c440b5c0f9afa Mon Sep 17 00:00:00 2001
From: george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519>
Date: Wed, 5 Apr 2006 15:13:55 +0000
Subject: [PATCH] Removed unnecessary methods from the rfb::ScaledPixelBuffer()
 class (getSride(), getPixelsR(), getImage()). This methods could be
 implemented in the derived classes using inheriting from rfb::PixelBuffer
 class.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@512 3789f03b-4d11-0410-bbf8-ca57d06f2519
---
 rfb/ScaledPixelBuffer.cxx | 23 -----------------------
 rfb/ScaledPixelBuffer.h   | 13 -------------
 2 files changed, 36 deletions(-)

diff --git a/rfb/ScaledPixelBuffer.cxx b/rfb/ScaledPixelBuffer.cxx
index 57db57f4..1eb8e94f 100644
--- a/rfb/ScaledPixelBuffer.cxx
+++ b/rfb/ScaledPixelBuffer.cxx
@@ -42,29 +42,6 @@ ScaledPixelBuffer::ScaledPixelBuffer()
 ScaledPixelBuffer::~ScaledPixelBuffer() {
 }
 
-const U8* ScaledPixelBuffer::getPixelsR(const Rect& r, int* stride) {
-  *stride = getStride();
-  return &scaled_data[(r.tl.x + (r.tl.y * *stride)) * bpp/8];
-}
-
-void ScaledPixelBuffer::getImage(void* imageBuf, const Rect& r, int outStride) {
-  int inStride;
-  const U8* pixels_data = getPixelsR(r, &inStride);
-  // We assume that the specified rectangle is pre-clipped to the buffer
-  int bytesPerPixel = bpp/8;
-  int inBytesPerRow = inStride * bytesPerPixel;
-  if (!outStride) outStride = r.width();
-  int outBytesPerRow = outStride * bytesPerPixel;
-  int bytesPerMemCpy = r.width() * bytesPerPixel;
-  U8* imageBufPos = (U8*)imageBuf;
-  const U8* end = pixels_data + (inBytesPerRow * r.height());
-  while (pixels_data < end) {
-    memcpy(imageBufPos, pixels_data, bytesPerMemCpy);
-    imageBufPos += outBytesPerRow;
-    pixels_data += inBytesPerRow;
-  }
-} 
-
 void ScaledPixelBuffer::setScale(int scale_) {
   if (scale != scale_) {
     scale = scale_;
diff --git a/rfb/ScaledPixelBuffer.h b/rfb/ScaledPixelBuffer.h
index 4f652b05..cd92ca83 100644
--- a/rfb/ScaledPixelBuffer.h
+++ b/rfb/ScaledPixelBuffer.h
@@ -48,19 +48,6 @@ namespace rfb {
       return Rect(pos, pos.translate(Point(scaled_width, scaled_height)));
     }
 
-    // Get the number of pixels per row in the actual pixel buffer data area
-    virtual int getStride() const { return width(); } 
-
-    // Get a pointer into the buffer
-    //   The pointer is to the top-left pixel of the specified Rect.
-    //   The buffer stride (in pixels) is returned.
-    virtual const U8* getPixelsR(const Rect& r, int* stride);
-
-    // Get pixel data for a given part of the buffer
-    //   Data is copied into the supplied buffer, with the specified
-    //   stride.
-    virtual void getImage(void* imageBuf, const Rect& r, int stride=0);
-
     // Set the new scale, in percent
     virtual void setScale(int scale);
 
-- 
2.39.5