vcl/source/gdi/print2.cxx | 12 ++++++++++++ 1 file changed, 12 insertions(+)
New commits: commit 2af290ddd365406ed03d144559288d4effd1323e Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Mon Apr 12 12:11:42 2021 +0100 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Tue Apr 13 14:53:24 2021 +0200 tdf#134736 move nLastBgAction to also include any trailing pops RemoveTransparenciesFromMetaFile is a very fragile thing Change-Id: I8feeb436426d16087ab5fbaddf6b39ac32574e5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113992 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index 6094417d940d..4479ea39383d 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -790,6 +790,18 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, ++nActionNum; } + if (nLastBgAction != -1) + { + size_t nActionSize = rInMtf.GetActionSize(); + // tdf#134736 move nLastBgAction to also include any trailing pops + for (size_t nPostLastBgAction = nLastBgAction + 1; nPostLastBgAction < nActionSize; ++nPostLastBgAction) + { + if (rInMtf.GetAction(nPostLastBgAction)->GetType() != MetaActionType::POP) + break; + nLastBgAction = nPostLastBgAction; + } + } + aMapModeVDev->ClearStack(); // clean up aMapModeVDev // fast-forward until one after the last background action _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits