core.git: vcl/source

[Michael Weghorn (via logerrit)]

 vcl/source/bitmap/BlendFrameCache.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 44dfcebde64b9edfa9f50eace34e5e1497ab9314
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Jan 14 05:59:31 2025 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jan 14 07:27:41 2025 +0100

    Revert "vcl: remove unnecessary resets"
    
    This reverts commit 210f30410803113cbbd3d32062c2769b95aa8a81.
    
    Reason for revert:
    As Mike Kaganski explains in [1]:
    
    > This is technically wrong. The bitmaps must not be used when they
    > have active write access. Creation of the BitmapEx in theory may
    > scale the bitmaps (indeed, here they are created with the same size), > 
which would assert on active write access.
    >
    > Se tdf#156856
    
    
    [1] 
https://gerrit.libreoffice.org/c/core/+/180142/comments/d55835ab_a4f52e04
    
    Change-Id: I731b7ff2b17f33f886e7113ad48e30f87e9b80d6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180211
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/vcl/source/bitmap/BlendFrameCache.cxx 
b/vcl/source/bitmap/BlendFrameCache.cxx
index 126e008f5f39..f233591f0abe 100644
--- a/vcl/source/bitmap/BlendFrameCache.cxx
+++ b/vcl/source/bitmap/BlendFrameCache.cxx
@@ -127,6 +127,9 @@ BlendFrameCache::BlendFrameCache(Size const& rSize, 
sal_uInt8 nAlpha, Color cons
         }
     }
 
+    pContent.reset();
+    pAlpha.reset();
+
     m_aLastResult = BitmapEx(aContent, aAlpha);
 }