[Libreoffice-commits] core.git: Branch 'libreoffice-7-0-0' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/outdev/bitmap.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit e04cc65a04443d0399f685f00db077a81cf91838
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 16 11:10:53 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Jul 17 11:19:45 2020 +0200

    tdf#134841 image totally clipped out
    
    the clip region seems to be out of date, this looks similar to
    the problem of
    
    "compared to other public methods of OutputDevice this test was missing ...
    one of the goals of the change was to use that method more often, so this may
    have never been detected before"
    
    where typical setup code was missing
    
    commit 828504974d70111e4a35b31d579cf42fe660a660
    Date:   Fri Feb 21 16:58:17 2020 +0100
    
        tdf#130768 speedup huge pixel graphics Cairo
    
    Change-Id: Icd1495f3830b69ae207cad308e821257e3e5e44b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98836
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit d44ddfce0766f57ac7d14978dd9e12813af93ce7)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98843
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Tested-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index ea29dc438119..83b625d828cb 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -1210,6 +1210,12 @@ void OutputDevice::DrawTransformedBitmapEx(
     if ( !mpGraphics && !AcquireGraphics() )
         return;
 
+    if ( mbInitClipRegion )
+        InitClipRegion();
+
+    if ( mbOutputClipped )
+        return;
+
 #ifdef DO_TIME_TEST
     // MM02 start time test when some data (not for trivial stuff). Will
     // trigger and show data when leaving this method by destructing helper