|
 |
f325b2 |
From e14efbfe1829ea54b5b794903282d3bf834e7e83 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Thu, 15 Oct 2015 09:41:52 +0200
|
|
|
f325b2 |
Subject: [PATCH 209/398] lok::Document::paintTile: fix non-rectangular tiles
|
|
|
f325b2 |
wrt. transparency
|
|
|
f325b2 |
|
|
|
f325b2 |
When copying the alpha channel, the offset was incorrect when canvas
|
|
|
f325b2 |
width/height did not equal.
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: If0ab3ec7a4ad4dd958419b566fd473732965cfda
|
|
|
f325b2 |
(cherry picked from commit d30f5bc3e65463f28c3087acad6f88e12d60e53b)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
desktop/qa/desktop_lib/test_desktop_lib.cxx | 21 +++++++++++++++++++++
|
|
|
f325b2 |
desktop/source/lib/init.cxx | 2 +-
|
|
|
f325b2 |
2 files changed, 22 insertions(+), 1 deletion(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
|
|
|
f325b2 |
index 30d8ae7adaf0..c3cc748a5d61 100644
|
|
|
f325b2 |
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
|
|
|
f325b2 |
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
|
|
|
f325b2 |
@@ -61,6 +61,7 @@ public:
|
|
|
f325b2 |
void testGetFilterTypes();
|
|
|
f325b2 |
void testGetPartPageRectangles();
|
|
|
f325b2 |
void testSearchCalc();
|
|
|
f325b2 |
+ void testPaintTile();
|
|
|
f325b2 |
|
|
|
f325b2 |
CPPUNIT_TEST_SUITE(DesktopLOKTest);
|
|
|
f325b2 |
CPPUNIT_TEST(testGetStyles);
|
|
|
f325b2 |
@@ -69,6 +70,7 @@ public:
|
|
|
f325b2 |
CPPUNIT_TEST(testGetFilterTypes);
|
|
|
f325b2 |
CPPUNIT_TEST(testGetPartPageRectangles);
|
|
|
f325b2 |
CPPUNIT_TEST(testSearchCalc);
|
|
|
f325b2 |
+ CPPUNIT_TEST(testPaintTile);
|
|
|
f325b2 |
CPPUNIT_TEST_SUITE_END();
|
|
|
f325b2 |
|
|
|
f325b2 |
uno::Reference<lang::XComponent> mxComponent;
|
|
|
f325b2 |
@@ -280,6 +282,25 @@ void DesktopLOKTest::testSearchCalc()
|
|
|
f325b2 |
comphelper::LibreOfficeKit::setActive(false);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
+void DesktopLOKTest::testPaintTile()
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+ LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
|
|
|
f325b2 |
+ int nCanvasWidth = 100;
|
|
|
f325b2 |
+ int nCanvasHeight = 300;
|
|
|
f325b2 |
+ std::vector<unsigned char> aBuffer(nCanvasWidth * nCanvasHeight * 4);
|
|
|
f325b2 |
+ int nTilePosX = 0;
|
|
|
f325b2 |
+ int nTilePosY = 0;
|
|
|
f325b2 |
+ int nTileWidth = 1000;
|
|
|
f325b2 |
+ int nTileHeight = 3000;
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ // This used to crash: painTile() implementation did not handle
|
|
|
f325b2 |
+ // nCanvasWidth != nCanvasHeight correctly, as usually both are just always
|
|
|
f325b2 |
+ // 256.
|
|
|
f325b2 |
+ pDocument->pClass->paintTile(pDocument, aBuffer.data(), nCanvasWidth, nCanvasHeight, nTilePosX, nTilePosY, nTileWidth, nTileHeight);
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ closeDoc();
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
|
|
|
f325b2 |
|
|
|
f325b2 |
CPPUNIT_PLUGIN_IMPLEMENT();
|
|
|
f325b2 |
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
|
|
|
f325b2 |
index b69e58a4af1f..053ab440bf55 100644
|
|
|
f325b2 |
--- a/desktop/source/lib/init.cxx
|
|
|
f325b2 |
+++ b/desktop/source/lib/init.cxx
|
|
|
f325b2 |
@@ -788,7 +788,7 @@ void doc_paintTile (LibreOfficeKitDocument* pThis,
|
|
|
f325b2 |
{
|
|
|
f325b2 |
for (int nCol = 0; nCol < nCanvasWidth; ++nCol)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- const int nOffset = (nCanvasHeight * nRow) + nCol;
|
|
|
f325b2 |
+ const int nOffset = (nCanvasWidth * nRow) + nCol;
|
|
|
f325b2 |
// VCL's transparent is 0, RGBA's transparent is 0xff.
|
|
|
f325b2 |
pBuffer[nOffset * 4 +3] = 0xff - aAlpha[nOffset];
|
|
|
f325b2 |
}
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|