ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Hanlde TopDown -> BottomUp conversion in basebmp DirectCopy logic

Browse Source 
Change-Id: Ic6b94e8f01c0151741626f8b50d69597cc401852
Reviewed-on: https://gerrit.libreoffice.org/6155
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
This commit is contained in:
tsahi glik
2013-10-08 19:57:25 +00:00
committed by Tor Lillqvist
parent 3786609a15
commit 91caa3dbe2
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
basebmp/source/bitmapdevice.cxx
+18 -4
View File
@@ -749,21 +749,33 @@ namespace
char* srcBuf = (char*)rSrcBitmap->getBuffer().get();
sal_Int32 dstStride = getScanlineStride();
sal_Int32 srcStride = rSrcBitmap->getScanlineStride();
int bytesPerPixel = (bitsPerPixel[getScanlineFormat()] + 7) >> 3; // round up to bytes
sal_Int32 bytesPerPixel = (bitsPerPixel[getScanlineFormat()] + 7) >> 3; // round up to bytes
bool dstTopDown = isTopDown();
bool srcTopDown = rSrcBitmap->isTopDown();
if (dstBuf == srcBuf && nSrcY < nDestY) // reverse copy order to avoid overlapping
{
dstBuf += dstStride * (getBufferSize().getY() - 1);
srcBuf += srcStride * (getBufferSize().getY() - 1);
nSrcY = getBufferSize().getY() - nSrcY - nSrcHeight;
nDestY = getBufferSize().getY() - nDestY - nSrcHeight;
srcTopDown = !srcTopDown;
dstTopDown = !dstTopDown;
}
if (!dstTopDown)
{
dstBuf += dstStride * (getBufferSize().getY() - 1);
dstStride = -dstStride;
}
if (!srcTopDown)
{
srcBuf += srcStride * (rSrcBitmap->getBufferSize().getY() - 1);
srcStride = -srcStride;
}
char* dstline = dstBuf + dstStride * nDestY + nDestX * bytesPerPixel;
char* srcline = srcBuf + srcStride * nSrcY + nSrcX * bytesPerPixel;
int lineBytes = nSrcWidth * bytesPerPixel;
sal_Int32 lineBytes = nSrcWidth * bytesPerPixel;
for(; 0 < nSrcHeight; nSrcHeight--)
{
@@ -1916,6 +1928,8 @@ inline sal_uInt32 nextPow2( sal_uInt32 x )
}
namespace
{
BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector& rSize,