diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-10-26 21:16:28 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-10-27 11:20:46 +0100 |
| commit | 4a35c118a3a6b954827953674cc9bad435c394ee (patch) | |
| tree | 634777e6795c0cbd049bd7bfdd8de3e4b1624b48 /emfio/qa | |
| parent | 6dfbab409032516e05a63fbc777b9147d1deb4ec (diff) | |
tdf#137413 EMF import: fix transparency in the PDF fallback case
Commit d75c5b38911557173c54a78f42ff220ab3918573 (tdf#136836 emfio: speed
up import of EMF import when the orig PDF is available, 2020-09-17)
improved both performance and correctness of the EMF import, in case it
had a PDF fallback.
It turns out that PDF fallback can be nominally non-transparent, and
still the EMF equivalent supports transparency.
Fix the problem by enabling transparency in the PDF-in-EMF case.
Change-Id: I4d1585a5db6f28bd9c9cb380b5f193f4d5edcc8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104849
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'emfio/qa')
| -rw-r--r-- | emfio/qa/cppunit/emf/EmfImportTest.cxx | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx index 9d3364693530..45894455141e 100644 --- a/emfio/qa/cppunit/emf/EmfImportTest.cxx +++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx @@ -26,6 +26,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/tools/primitive2dxmldump.hxx> +#include <vcl/bitmapaccess.hxx> #include <memory> @@ -243,6 +244,20 @@ void Test::TestPdfInEmf() // i.e. there was no size hint, the shape with 14cm height had a bitmap-from-PDF fill, the PDF // height was only 5cm, so it looked blurry. CPPUNIT_ASSERT_EQUAL(14321.0, pVectorGraphicData->getSizeHint().getY()); + +#if !defined(WNT) && !defined(MACOSX) + // Hmm, manual testing on Windows looks OK. + BitmapEx aBitmapEx = aGraphic.GetBitmapEx(); + AlphaMask aMask = aBitmapEx.GetAlpha(); + Bitmap::ScopedReadAccess pAccess(aMask); + Color aColor(pAccess->GetPixel(0, 0)); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 220 + // - Actual : 0 + // i.e. the pixel at the top left corner was entirely opaque, while it should be mostly + // transparent. + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt8>(220), aColor.GetBlue()); +#endif } CPPUNIT_TEST_SUITE_REGISTRATION(Test); |