[Libreoffice-commits] core.git: vcl/qa vcl/source

[Caolán McNamara (via logerrit)]

 vcl/qa/cppunit/graphicfilter/data/svm/pass/ofz-timeout-1.svm |binary
 vcl/source/bitmap/BitmapEx.cxx                               |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2652675c417353bd0f072bc7c2579b6d24bf3eba
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Aug 22 20:31:07 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Aug 23 10:00:40 2021 +0200

    ofz: use BmpScaleFlag::Fast when recovering from bad svm mask size
    
    this isn't supposed to happen and is an error recovery added by:
    
    commit baebeb7de4c5f9511e45c2846ec2a72861a948c0
    Date:   Fri Jul 27 14:04:19 2012 +0000
    
        Resolves: #i120165# Adapt Mask/Alpha at BitmapEx construction...
    
        when size differs from base bitmap
    
    so use the time-cheapest scaling available
    
    Change-Id: I6ea8f458681dcb69e1c128040cc550dd86ff7151
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120855
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/qa/cppunit/graphicfilter/data/svm/pass/ofz-timeout-1.svm b/vcl/qa/cppunit/graphicfilter/data/svm/pass/ofz-timeout-1.svm
new file mode 100644
index 000000000000..5b61891be667
Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/svm/pass/ofz-timeout-1.svm differ
diff --git a/vcl/source/bitmap/BitmapEx.cxx b/vcl/source/bitmap/BitmapEx.cxx
index 91ee55c58ed3..187b9290738e 100644
--- a/vcl/source/bitmap/BitmapEx.cxx
+++ b/vcl/source/bitmap/BitmapEx.cxx
@@ -133,7 +133,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ) :
     if (!maBitmap.IsEmpty() && maBitmap.GetSizePixel() != maAlphaMask.GetSizePixel())
     {
         OSL_ENSURE(false, "Mask size differs from Bitmap size, corrected Mask (!)");
-        maAlphaMask.Scale(maBitmap.GetSizePixel());
+        maAlphaMask.Scale(maBitmap.GetSizePixel(), BmpScaleFlag::Fast);
     }
 }
 
@@ -145,7 +145,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ) :
     if (!maBitmap.IsEmpty() && !maAlphaMask.IsEmpty() && maBitmap.GetSizePixel() != maAlphaMask.GetSizePixel())
     {
         OSL_ENSURE(false, "Alpha size differs from Bitmap size, corrected Mask (!)");
-        maAlphaMask.Scale(rBmp.GetSizePixel());
+        maAlphaMask.Scale(rBmp.GetSizePixel(), BmpScaleFlag::Fast);
     }
 }