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/inc | |
| 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/inc')
| -rw-r--r-- | emfio/inc/mtftools.hxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx index 5c0c60973350..70471b66ea21 100644 --- a/emfio/inc/mtftools.hxx +++ b/emfio/inc/mtftools.hxx @@ -441,6 +441,7 @@ namespace emfio BitmapEx aBmpEx; tools::Rectangle aOutRect; sal_uInt32 nWinRop; + bool m_bForceAlpha = false; BSaveStruct(const Bitmap& rBmp, const tools::Rectangle& rOutRect, sal_uInt32 nRop) : aBmpEx(rBmp) @@ -448,10 +449,12 @@ namespace emfio , nWinRop(nRop) {} - BSaveStruct(const BitmapEx& rBmpEx, const tools::Rectangle& rOutRect, sal_uInt32 nRop) + BSaveStruct(const BitmapEx& rBmpEx, const tools::Rectangle& rOutRect, sal_uInt32 nRop, + bool bForceAlpha = false) : aBmpEx(rBmpEx) , aOutRect(rOutRect) , nWinRop(nRop) + , m_bForceAlpha(bForceAlpha) {} }; |