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

Stephan Bergmann sbergman at redhat.com
Mon Jan 12 07:44:53 PST 2015


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

New commits:
commit 3d660c04bce0b5d24b5ec2558727c25ba13171b3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jan 12 16:44:19 2015 +0100

    Work around -fsanitize=shift
    
    Change-Id: I8d23c11decca864337ccc5288165058a7c21cd4e

diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx
index 0503ef2..56c0d66 100644
--- a/vcl/source/gdi/regionband.cxx
+++ b/vcl/source/gdi/regionband.cxx
@@ -480,7 +480,7 @@ bool RegionBand::InsertLine(const Point& rStartPt, const Point& rEndPt, long nLi
 
         if ( nDX >= nDY )
         {
-            const long  nDYX = ( nDY - nDX ) << 1;
+            const long  nDYX = ( nDY - nDX ) * 2;
             const long  nDY2 = nDY << 1;
             long        nD = nDY2 - nDX;
 
@@ -496,7 +496,7 @@ bool RegionBand::InsertLine(const Point& rStartPt, const Point& rEndPt, long nLi
         }
         else
         {
-            const long  nDYX = ( nDX - nDY ) << 1;
+            const long  nDYX = ( nDX - nDY ) * 2;
             const long  nDY2 = nDX << 1;
             long        nD = nDY2 - nDY;
 


More information about the Libreoffice-commits mailing list