commit 2af290ddd365406ed03d144559288d4effd1323e
author Caolán McNamara <caolanm@redhat.com> Mon Apr 12 12:11:42 2021 +0100
committer Miklos Vajna <vmiklos@collabora.com> Tue Apr 13 14:53:24 2021 +0200
tree 55f22a5fdee75d3904ea652597c84ad51ffe22e4
parent ad8ddc0bb2535b6d6bad53dd137c3d8e682dfd1f

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 <vmiklos@collabora.com>

vcl/source/gdi/print2.cxx

diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 6094417..4479ea3 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