Small ScaledPixelBuffer class improvements.

Now src_data is a pointer to original image buffer.

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

diff --git a/rfb/ScaledPixelBuffer.cxx b/rfb/ScaledPixelBuffer.cxx
index 2e1c0c7ec39d1a6a4f8845490f9b509a5b414ab8..2aedb829840f64043e4109991594ed4dbd285fa4 100644 (file)
--- a/rfb/ScaledPixelBuffer.cxx
+++ b/rfb/ScaledPixelBuffer.cxx
@@ -26,7 +26,7 @@
 using namespace rdr;
 using namespace rfb;
 
-ScaledPixelBuffer::ScaledPixelBuffer(U8 *src_data_, int src_width_,
+ScaledPixelBuffer::ScaledPixelBuffer(U8 **src_data_, int src_width_,
                                      int src_height_, int scale)
   : src_data(src_data_), src_width(src_width_), src_height(src_height_),
     bpp(32), scaled_data(0) {
@@ -119,7 +119,7 @@ void ScaledPixelBuffer::scaleRect(const Rect& r) {
       dx -= i;
       c1_sub_dx = 1 - dx;
 
-      src_ptr = &src_data[(i + (j*src_width))*4];
+      src_ptr = &(*src_data)[(i + (j*src_width))*4];
       b0 = *src_ptr; g0 = *(src_ptr+1); r0 = *(src_ptr+2);
       if (i+1 < src_width) {
         b1 = *(src_ptr+4); g1 = *(src_ptr+5); r1 = *(src_ptr+6);

diff --git a/rfb/ScaledPixelBuffer.h b/rfb/ScaledPixelBuffer.h
index 34e73eeaaece1d3d1c4b619b0fe3505332efcd01..4051a380c2b69c20926f8c372c84bd93f8c12aac 100644 (file)
--- a/rfb/ScaledPixelBuffer.h
+++ b/rfb/ScaledPixelBuffer.h
@@ -31,7 +31,7 @@ namespace rfb {
 
   class ScaledPixelBuffer {
   public:
-    ScaledPixelBuffer(U8 *data, int width, int height, int scale);
+    ScaledPixelBuffer(U8 **data, int width, int height, int scale);
     ScaledPixelBuffer();
     virtual ~ScaledPixelBuffer();
 
@@ -75,7 +75,7 @@ namespace rfb {
     int src_height;
     int bpp;
     double scale_ratio;
-    U8 *src_data;
+    U8 **src_data;
     U8 *scaled_data;
   };