diff options
| author | Pierre Ossman <ossman@cendio.se> | 2011-06-08 16:58:19 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2011-06-08 16:58:19 +0000 |
| commit | 494271583e29d6d15036989322c62f88f941bc32 (patch) | |
| tree | 23ddfa880de61e2a042984db5a9d6fcebe9effeb /common/rfb/TransImageGetter.cxx | |
| parent | aeff3314dc4ca0fecb18d57057fa1785d5877c13 (diff) | |
| download | tigervnc-494271583e29d6d15036989322c62f88f941bc32.tar.gz tigervnc-494271583e29d6d15036989322c62f88f941bc32.zip | |
Accidentally calculated the pointer offset twice, resulting in segfaults.
Make sure we get the proper address for the data shuffling.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4471 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/rfb/TransImageGetter.cxx')
| -rw-r--r-- | common/rfb/TransImageGetter.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/rfb/TransImageGetter.cxx b/common/rfb/TransImageGetter.cxx index e2939c7b..f4154554 100644 --- a/common/rfb/TransImageGetter.cxx +++ b/common/rfb/TransImageGetter.cxx @@ -62,7 +62,8 @@ void TransImageGetter::getImage(void* outPtr, const Rect& r, int outStride) if (!outStride) outStride = r.width(); - translateRect((void*)inPtr, inStride, r, outPtr, outStride, r.tl); + translateRect((void*)inPtr, inStride, Rect(0, 0, r.width(), r.height()), + outPtr, outStride, Point(0, 0)); } void TransImageGetter::cmCallback(int firstColour, int nColours, |