Added the default constructor to the rfb::ScaledPixelBuffer class.

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

diff --git a/rfb/ScaledPixelBuffer.cxx b/rfb/ScaledPixelBuffer.cxx
index 932221d445100db240777e03d480c01e1a13b705..1ed7a5c263916bb9a5dfa7acf4b67391af3f20f0 100644 (file)
--- a/rfb/ScaledPixelBuffer.cxx
+++ b/rfb/ScaledPixelBuffer.cxx
@@ -39,8 +39,12 @@ ScaledPixelBuffer::ScaledPixelBuffer(U8 *src_data_, int src_width_,
   data = new U8[width_ * height_ * 4];
 }
 
+ScaledPixelBuffer::ScaledPixelBuffer() 
+  : src_data(0), src_width(0), src_height(0), scale_ratio(1), bpp(32), data(0) {
+}
+
 ScaledPixelBuffer::~ScaledPixelBuffer() {
-  delete [] data;
+  if (data) delete [] data;
 }
 
 const U8* ScaledPixelBuffer::getPixelsR(const Rect& r, int* stride) {
@@ -73,7 +77,7 @@ void ScaledPixelBuffer::setScale(int scale) {
     width_  = (int)ceil(src_width  * scale_ratio);
     height_ = (int)ceil(src_height * scale_ratio);
 
-    delete [] data;
+    if (data) delete [] data;
     data = new U8[width_ * height_ * 4];
 
     scaleRect(Rect(0, 0, width_, height_));

diff --git a/rfb/ScaledPixelBuffer.h b/rfb/ScaledPixelBuffer.h
index 05a419d6d9b1572b858c56745d37cd4c2edd8ccf..723ce6ec234ec1d1105779b7ae768bd9d4d76d7f 100644 (file)
--- a/rfb/ScaledPixelBuffer.h
+++ b/rfb/ScaledPixelBuffer.h
@@ -32,6 +32,7 @@ namespace rfb {
   class ScaledPixelBuffer {
   public:
     ScaledPixelBuffer(U8 *data, int width, int height, int scale);
+    ScaledPixelBuffer();
     virtual ~ScaledPixelBuffer();
 
     // Get width, height, number of pixels and scale