[Libreoffice-commits] core.git: drawinglayer/source

[Caolán McNamara (via logerrit)]

 drawinglayer/source/processor2d/vclhelperbufferdevice.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 11fe18ea21974e4fdc01a3f4a455725cec8ce11a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Mar 29 14:05:55 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Mar 29 20:15:47 2019 +0100

    copy between the outputdevices without interim Bitmap
    
    Change-Id: I6c0097b1b069cad2771c94210986714d59431e4f
    Reviewed-on: https://gerrit.libreoffice.org/69929
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index e30851d23493..c377f4ee6526 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -334,7 +334,6 @@ namespace drawinglayer
 
             mrOutDev.EnableMapMode(false);
             mpContent->EnableMapMode(false);
-            Bitmap aContent(mpContent->GetBitmap(aEmptyPoint, aSizePixel));
 
 #ifdef DBG_UTIL
             if(bDoSaveForVisualControl)
@@ -346,6 +345,7 @@ namespace drawinglayer
                     "~/content.bmp",
 #endif
                     StreamMode::WRITE|StreamMode::TRUNC);
+                Bitmap aContent(mpContent->GetBitmap(aEmptyPoint, aSizePixel));
                 WriteDIB(aContent, aNew, false, true);
             }
 #endif
@@ -373,6 +373,7 @@ namespace drawinglayer
                 }
 #endif
 
+                Bitmap aContent(mpContent->GetBitmap(aEmptyPoint, aSizePixel));
                 mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aAlphaMask));
             }
             else if(mpMask)
@@ -394,17 +395,21 @@ namespace drawinglayer
                 }
 #endif
 
+                Bitmap aContent(mpContent->GetBitmap(aEmptyPoint, aSizePixel));
                 mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aMask));
             }
             else if(0.0 != fTrans)
             {
                 sal_uInt8 nMaskValue(static_cast<sal_uInt8>(basegfx::fround(fTrans * 255.0)));
                 const AlphaMask aAlphaMask(aSizePixel, &nMaskValue);
+                Bitmap aContent(mpContent->GetBitmap(aEmptyPoint, aSizePixel));
                 mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aAlphaMask));
             }
             else
             {
-                mrOutDev.DrawBitmap(maDestPixel.TopLeft(), aContent);
+                mrOutDev.DrawOutDev(maDestPixel.TopLeft(), aSizePixel,
+                                    aEmptyPoint, aSizePixel,
+                                    *mpContent);
             }
 
             mrOutDev.SetRasterOp(aOrigRasterOp);