diff options
| author | Tsahi Glik <tsahi.glik@cloudon.com> | 2013-06-04 20:25:41 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-06-04 20:38:09 +0200 |
| commit | 31b35ed6bb7fe77f3f276b00fefce112a620b6ac (patch) | |
| tree | 4527afa82e6b6eb0a14237881f4cfc97cff96a14 | |
| parent | c32c11fbd49e0194534be9d21c22da6799728be3 (diff) | |
Detect copyArea trying to operate on overlapping memory.
Equality test also needs to check if disjunct BitmapDevice instances
might not actually share the same memory buffer.
Change-Id: I09a93cb092a0039353be211ed053e991e7fe66f0
| -rw-r--r-- | basebmp/source/bitmapdevice.cxx | 13 | ||||
| -rw-r--r-- | include/basebmp/bitmapdevice.hxx | 3 |
2 files changed, 12 insertions, 4 deletions
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index d1a19f938d07..ff017ec50e34 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -680,7 +680,7 @@ namespace destIterRange(begin, acc, rDstRect), - rSrcBitmap.get() == this ); + isSharedBuffer(rSrcBitmap) ); damaged( rDstRect ); } @@ -903,7 +903,7 @@ namespace Masks::clipmask_polarity, FastMask >::type(acc), rDstRect), - rSrcBitmap.get() == this); + isSharedBuffer(rSrcBitmap)); damaged( rDstRect ); } @@ -1147,6 +1147,11 @@ PaletteMemorySharedVector BitmapDevice::getPalette() const return mpImpl->mpPalette; } +bool BitmapDevice::isSharedBuffer( const BitmapDeviceSharedPtr& rOther ) const +{ + return rOther.get()->getBuffer().get() == getBuffer().get(); +} + void BitmapDevice::clear( Color fillColor ) { clear_i( fillColor, mpImpl->maBounds ); @@ -1507,7 +1512,7 @@ void BitmapDevice::drawMaskedColor( Color aSrcColor, assertImagePoint(aDestPoint,mpImpl->maBounds); assertImageRange(aSrcRange,aSrcBounds); - if( rAlphaMask.get() == this ) + if( isSharedBuffer(rAlphaMask) ) { // src == dest, copy rAlphaMask beforehand // --------------------------------------------------- @@ -1560,7 +1565,7 @@ void BitmapDevice::drawMaskedColor( Color aSrcColor, if( isCompatibleClipMask( rClip ) ) { - if( rAlphaMask.get() == this ) + if( isSharedBuffer(rAlphaMask) ) { // src == dest, copy rAlphaMask beforehand // --------------------------------------------------- diff --git a/include/basebmp/bitmapdevice.hxx b/include/basebmp/bitmapdevice.hxx index 941b01c840c3..84c6d75f32bd 100644 --- a/include/basebmp/bitmapdevice.hxx +++ b/include/basebmp/bitmapdevice.hxx @@ -140,6 +140,9 @@ public: */ PaletteMemorySharedVector getPalette() const; + /// Check if this and the other BitmapDevice share a buffer + bool isSharedBuffer( const BitmapDeviceSharedPtr& rOther ) const; + /** Clear whole device with given color This method works like a fill with the given color value, |