diff options
author | Pierre Ossman <ossman@cendio.se> | 2015-11-10 13:03:26 +0100 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2015-11-27 10:58:02 +0100 |
commit | 7bfb73b61210f5d38a8162a88730fb8bb5bfb33b (patch) | |
tree | ee022665b3a400e45a5936e59f3c3358f979efd3 /common/rfb | |
parent | 8635062c071d23bf75dc4d9be598ee39a735d891 (diff) | |
download | tigervnc-7bfb73b61210f5d38a8162a88730fb8bb5bfb33b.tar.gz tigervnc-7bfb73b61210f5d38a8162a88730fb8bb5bfb33b.zip |
Remove CMsgReader::getImageBuf() as nothing uses it
Diffstat (limited to 'common/rfb')
-rw-r--r-- | common/rfb/CMsgReader.cxx | 24 | ||||
-rw-r--r-- | common/rfb/CMsgReader.h | 3 |
2 files changed, 1 insertions, 26 deletions
diff --git a/common/rfb/CMsgReader.cxx b/common/rfb/CMsgReader.cxx index 04846ef4..96ddf443 100644 --- a/common/rfb/CMsgReader.cxx +++ b/common/rfb/CMsgReader.cxx @@ -23,19 +23,17 @@ #include <rfb/util.h> #include <rfb/CMsgHandler.h> #include <rfb/CMsgReader.h> -#include <rfb/Decoder.h> using namespace rfb; CMsgReader::CMsgReader(CMsgHandler* handler_, rdr::InStream* is_) : imageBufIdealSize(0), handler(handler_), is(is_), - imageBuf(0), imageBufSize(0), nUpdateRectsLeft(0) + nUpdateRectsLeft(0) { } CMsgReader::~CMsgReader() { - delete [] imageBuf; } void CMsgReader::readServerInit() @@ -242,23 +240,3 @@ void CMsgReader::readExtendedDesktopSize(int x, int y, int w, int h) handler->setExtendedDesktopSize(x, y, w, h, layout); } - -rdr::U8* CMsgReader::getImageBuf(int required, int requested, int* nPixels) -{ - int requiredBytes = required * (handler->cp.pf().bpp / 8); - int requestedBytes = requested * (handler->cp.pf().bpp / 8); - int size = requestedBytes; - if (size > imageBufIdealSize) size = imageBufIdealSize; - - if (size < requiredBytes) - size = requiredBytes; - - if (imageBufSize < size) { - imageBufSize = size; - delete [] imageBuf; - imageBuf = new rdr::U8[imageBufSize]; - } - if (nPixels) - *nPixels = imageBufSize / (handler->cp.pf().bpp / 8); - return imageBuf; -} diff --git a/common/rfb/CMsgReader.h b/common/rfb/CMsgReader.h index 3592ef87..42c64965 100644 --- a/common/rfb/CMsgReader.h +++ b/common/rfb/CMsgReader.h @@ -46,7 +46,6 @@ namespace rfb { void readMsg(); rdr::InStream* getInStream() { return is; } - rdr::U8* getImageBuf(int required, int requested=0, int* nPixels=0); int imageBufIdealSize; @@ -67,8 +66,6 @@ namespace rfb { CMsgHandler* handler; rdr::InStream* is; - rdr::U8* imageBuf; - int imageBufSize; int nUpdateRectsLeft; }; } |