[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit b929fd7a369630fa70a74eec3040761cea58b660
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Apr 18 10:24:19 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Tue Apr 23 13:09:22 2019 +0200

    forcepoint#78 large double cast to sal_Int32 wraps to neg
    
    Change-Id: I831d0dd62d0b28dc19b90b03de3eaa159984347c
    Reviewed-on: https://gerrit.libreoffice.org/70923
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index f970c93428ce..bb9db3d3b862 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -221,8 +221,8 @@ BitmapColor BitmapReadAccess::GetInterpolatedColorWithFallback( double fY, doubl
     // double values, e.g. static_cast< sal_Int32 >(-0.25) is 0, not -1, but *has* to be outside (!)
     if(mpBuffer && fX >= 0.0 && fY >= 0.0)
     {
-        const sal_Int32 nX(static_cast< sal_Int32 >(fX));
-        const sal_Int32 nY(static_cast< sal_Int32 >(fY));
+        const sal_Int64 nX(static_cast<sal_Int64>(fX));
+        const sal_Int64 nY(static_cast<sal_Int64>(fY));
 
         if(nX < mpBuffer->mnWidth && nY < mpBuffer->mnHeight)
         {