mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lok::Document::paintTile: fix non-rectangular tiles wrt. transparency

Browse Source 
When copying the alpha channel, the offset was incorrect when canvas
width/height did not equal.

Change-Id: If0ab3ec7a4ad4dd958419b566fd473732965cfda
This commit is contained in:
Miklos Vajna
2015-10-15 09:41:52 +02:00
parent 396da96d27
commit d30f5bc3e6
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
desktop/qa/desktop_lib/test_desktop_lib.cxx
View File

@@ -61,6 +61,7 @@ public:
void testGetFilterTypes();
void testGetPartPageRectangles();
void testSearchCalc();
void testPaintTile();
CPPUNIT_TEST_SUITE(DesktopLOKTest);
CPPUNIT_TEST(testGetStyles);
@@ -69,6 +70,7 @@ public:
CPPUNIT_TEST(testGetFilterTypes);
CPPUNIT_TEST(testGetPartPageRectangles);
CPPUNIT_TEST(testSearchCalc);
CPPUNIT_TEST(testPaintTile);
CPPUNIT_TEST_SUITE_END();
uno::Reference<lang::XComponent> mxComponent;
@@ -280,6 +282,25 @@ void DesktopLOKTest::testSearchCalc()
comphelper::LibreOfficeKit::setActive(false);
}
void DesktopLOKTest::testPaintTile()
{
LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
int nCanvasWidth = 100;
int nCanvasHeight = 300;
std::vector<unsigned char> aBuffer(nCanvasWidth * nCanvasHeight * 4);
int nTilePosX = 0;
int nTilePosY = 0;
int nTileWidth = 1000;
int nTileHeight = 3000;
// This used to crash: painTile() implementation did not handle
// nCanvasWidth != nCanvasHeight correctly, as usually both are just always
// 256.
pDocument->pClass->paintTile(pDocument, aBuffer.data(), nCanvasWidth, nCanvasHeight, nTilePosX, nTilePosY, nTileWidth, nTileHeight);
closeDoc();
}
CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
CPPUNIT_PLUGIN_IMPLEMENT();

2
desktop/source/lib/init.cxx
View File

@@ -789,7 +789,7 @@ void doc_paintTile (LibreOfficeKitDocument* pThis,
{
for (int nCol = 0; nCol < nCanvasWidth; ++nCol)
{
const int nOffset = (nCanvasHeight * nRow) + nCol;
const int nOffset = (nCanvasWidth * nRow) + nCol;
// VCL's transparent is 0, RGBA's transparent is 0xff.
pBuffer[nOffset * 4 +3] = 0xff - aAlpha[nOffset];
}