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

[Matthew J. Francis]

 vcl/source/gdi/bmpfast.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f857358d83e7c105271eb0e2c43f0b036f14f284
Author: Matthew J. Francis <mjay.francis at gmail.com>
Date:   Wed Nov 19 11:25:28 2014 +0800

    fdo#86298 Avoid crash blending upside down Bitmaps of differing size
    
    Change-Id: I3ed0dec7c2f8d80ca104f8ba8d47894ace582c0a
    Reviewed-on: https://gerrit.libreoffice.org/12961
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 1764dc6..ff51c23 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -566,7 +566,7 @@ bool ImplBlendToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine,
     // source and destination don't match: upside down
     if( (rSrcBuffer.mnFormat ^ rDstBuffer.mnFormat) & BMP_FORMAT_TOP_DOWN )
     {
-        aDstLine.AddByteOffset( (rSrcBuffer.mnHeight - 1) * nDstLinestep );
+        aDstLine.AddByteOffset( (rDstBuffer.mnHeight - 1) * nDstLinestep );
         nDstLinestep = -nDstLinestep;
     }