Small code improvements.

Added the new property scale to the rfb::ScaledPixelBuffer class.

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

diff --git a/rfb/ScaledPixelBuffer.cxx b/rfb/ScaledPixelBuffer.cxx
index a1f5763db12068ad7c752f4509767ac4409704bb..57db57f47696e58fe96393d30cbb6c6d3920b6d8 100644 (file)
--- a/rfb/ScaledPixelBuffer.cxx
+++ b/rfb/ScaledPixelBuffer.cxx
@@ -29,14 +29,14 @@ using namespace rfb;
 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), scale_ratio(0) {
+    bpp(32), scaled_data(0), scale_ratio(0), scale(100) {
 
   setScale(scale);
 }
 
 ScaledPixelBuffer::ScaledPixelBuffer() 
-  : src_data(0), src_width(0), src_height(0), scale_ratio(1), bpp(32), 
-    scaled_data(0) {
+  : src_data(0), src_width(0), src_height(0), scale_ratio(1), scale(100),
+    bpp(32), scaled_data(0) {
 }
 
 ScaledPixelBuffer::~ScaledPixelBuffer() {
@@ -65,8 +65,9 @@ void ScaledPixelBuffer::getImage(void* imageBuf, const Rect& r, int outStride) {
   }
 } 
 
-void ScaledPixelBuffer::setScale(int scale) {
-  if (scale != scale_ratio * 100) {
+void ScaledPixelBuffer::setScale(int scale_) {
+  if (scale != scale_) {
+    scale = scale_;
     scale_ratio = double(scale) / 100;
 
     scaled_width  = (int)ceil(src_width  * scale_ratio);

diff --git a/rfb/ScaledPixelBuffer.h b/rfb/ScaledPixelBuffer.h
index 8342a5830a146938e560a5d30a9447a95033fe53..4f652b05a508847e898983ad343a8f035f697e67 100644 (file)
--- a/rfb/ScaledPixelBuffer.h
+++ b/rfb/ScaledPixelBuffer.h
@@ -39,7 +39,7 @@ namespace rfb {
     int width()  const { return scaled_width; }
     int height() const { return scaled_height; }
     int area() const { return scaled_width * scaled_height; }
-    int scale() const { return (int)(scale_ratio * 100); }
+    int getScale() const { return scale; }
 
     // Get rectangle encompassing this buffer
     //   Top-left of rectangle is either at (0,0), or the specified point.
@@ -80,6 +80,7 @@ namespace rfb {
     int scaled_width;
     int scaled_height;
     int bpp;
+    int scale;
     double scale_ratio;
     U8 **src_data;
     U8 *scaled_data;