[opencv] 12/53: drawing: workaround MSVC2010 32-bit compiler bug

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.3
in repository opencv.

commit ebae963884ff0dfd8004395ac898f3578b4279a8
Author: Alexander Alekhin <alexander.a.alekhin at gmail.com>
Date:   Thu Feb 2 21:01:28 2017 +0300

    drawing: workaround MSVC2010 32-bit compiler bug
---
 modules/core/src/drawing.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/drawing.cpp b/modules/core/src/drawing.cpp
index d0b6fb1..91baec2 100644
--- a/modules/core/src/drawing.cpp
+++ b/modules/core/src/drawing.cpp
@@ -1185,8 +1185,12 @@ FillConvexPoly( Mat& img, const Point2l* v, int npts, const void* color, int lin
                         edges--;
                     }
 
-                    xs <<= XY_SHIFT - shift;
-                    xe = v[idx].x << (XY_SHIFT - shift);
+                    xe = v[idx].x;
+                    if (XY_SHIFT - shift != 0)
+                    {
+                        xs <<= XY_SHIFT - shift;
+                        xe <<= XY_SHIFT - shift;
+                    }
 
                     /* no more edges */
                     if( y >= ty)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git