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

[Caolán McNamara (via logerrit)]

 vcl/source/gdi/metaact.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5d77fe6e7a386efda32a19d3bca587b1ad12715d
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Dec 7 20:58:06 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Dec 7 22:57:29 2022 +0000

    ofz#53824 Out-of-memory
    
    Change-Id: Ia90527f97a4febf3bbdf1919e8db3d8ab5375ac6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143803
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index db503cfd294d..9fdb22003338 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -911,7 +911,7 @@ static bool AllowScale(const Size& rSource, const Size& 
rDest)
 
 void MetaBmpScaleAction::Execute( OutputDevice* pOut )
 {
-    if (!AllowScale(maBmp.GetSizePixel(), maSz))
+    if (!AllowScale(maBmp.GetSizePixel(), pOut->LogicToPixel(maSz)))
         return;
 
     pOut->DrawBitmap( maPt, maSz, maBmp );
@@ -1026,7 +1026,7 @@ MetaBmpExScaleAction::MetaBmpExScaleAction( const Point& 
rPt, const Size& rSz,
 
 void MetaBmpExScaleAction::Execute( OutputDevice* pOut )
 {
-    if (!AllowScale(maBmpEx.GetSizePixel(), maSz))
+    if (!AllowScale(maBmpEx.GetSizePixel(), pOut->LogicToPixel(maSz)))
         return;
 
     pOut->DrawBitmapEx( maPt, maSz, maBmpEx );