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

[Luboš Luňák (via logerrit)]

 vcl/source/outdev/bitmap.cxx |   27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

New commits:
commit 27a4aea50a9efa5c839b0ae2de1f9f14a7782f11
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Feb 10 17:15:19 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Feb 12 21:24:34 2021 +0100

    always optimize bitmap transform to translate+scale if possible (tdf#138068)
    
    Commit 828504974d70111e make OutputDevice::DrawTransformedBitmapEx()
    always call DrawTransformBitmapExDirect() in preference to explicitly
    converting to DrawBitmapEx() if the transformation wanted was at most
    translate+scale, in the hopes that these days the backend implementations
    work well enough. But it turns out only the Skia backend handles that
    without loss of performance. So always do the conversion to DrawBitmapEx()
    if possible. It's so simple that it possibly makes sense to always do
    this, regardless of the backend.
    
    Change-Id: I6eba68e672334c38433f53980f49400499f5d8e7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110716
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit 9d89d98d3349502b56da4bdd6ea287ac4cde9ce5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110781
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index dcb9a6b1d8d0..f8958a8f203a 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -1241,28 +1241,6 @@ void OutputDevice::DrawTransformedBitmapEx(
         : nullptr);
 #endif
 
-    // MM02 reorganize order: Prefer DrawTransformBitmapExDirect due
-    // to this having evolved and is improved on quite some systems.
-    // Check for exclusion parameters that may prevent using it
-    static bool bAllowPreferDirectPaint(true);
-    const bool bInvert(RasterOp::Invert == meRasterOp);
-    const bool bBitmapChangedColor(mnDrawMode & (DrawModeFlags::BlackBitmap | DrawModeFlags::WhiteBitmap | DrawModeFlags::GrayBitmap ));
-    const bool bTryDirectPaint(!bInvert && !bBitmapChangedColor && !bMetafile);
-
-    if(bAllowPreferDirectPaint && bTryDirectPaint)
-    {
-        // tdf#130768 CAUTION(!) using GetViewTransformation() is *not* enough here, it may
-        // be that mnOutOffX/mnOutOffY is used - see AOO bug 75163, mentioned at
-        // ImplGetDeviceTransformation declaration
-        const basegfx::B2DHomMatrix aFullTransform(ImplGetDeviceTransformation() * rTransformation);
-
-        if(DrawTransformBitmapExDirect(aFullTransform, rBitmapEx))
-        {
-            // we are done
-            return;
-        }
-    }
-
     // decompose matrix to check rotation and shear
     basegfx::B2DVector aScale, aTranslate;
     double fRotate, fShearX;
@@ -1297,8 +1275,9 @@ void OutputDevice::DrawTransformedBitmapEx(
         return;
     }
 
-    // MM02 bAllowPreferDirectPaint may have been false to allow
-    // to specify order of executions, so give bTryDirectPaint a call
+    const bool bInvert(RasterOp::Invert == meRasterOp);
+    const bool bBitmapChangedColor(mnDrawMode & (DrawModeFlags::BlackBitmap | DrawModeFlags::WhiteBitmap | DrawModeFlags::GrayBitmap ));
+    const bool bTryDirectPaint(!bInvert && !bBitmapChangedColor && !bMetafile);
     if(bTryDirectPaint)
     {
         // tdf#130768 CAUTION(!) using GetViewTransformation() is *not* enough here, it may