Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23503 from seanm:issue13729

Browse Source 
Fixed undefined left shifting of negative number
pull/23523/head
Alexander Smorkalov 2 years ago committed by GitHub
parent 3113b49159 aa2fabcba5
commit 4c06a721ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      modules/imgproc/src/drawing.cpp

4
modules/imgproc/src/drawing.cpp
Unescape View File

@ -358,7 +358,7 @@ LineAA( Mat& img, Point2l pt1, Point2l pt2, const void* color )
pt1.y ^= pt2.y & j; pt1.y ^= pt2.y & j;
x_step = XY_ONE; x_step = XY_ONE;
y_step = (dy << XY_SHIFT) / (ax | 1); y_step = (int64)((uint64_t)dy << XY_SHIFT) / (ax | 1);
pt2.x += XY_ONE; pt2.x += XY_ONE;
ecount = (int)((pt2.x >> XY_SHIFT) - (pt1.x >> XY_SHIFT)); ecount = (int)((pt2.x >> XY_SHIFT) - (pt1.x >> XY_SHIFT));
j = -(pt1.x & (XY_ONE - 1)); j = -(pt1.x & (XY_ONE - 1));
@ -380,7 +380,7 @@ LineAA( Mat& img, Point2l pt1, Point2l pt2, const void* color )
pt2.y ^= pt1.y & i; pt2.y ^= pt1.y & i;
pt1.y ^= pt2.y & i; pt1.y ^= pt2.y & i;
x_step = (dx << XY_SHIFT) / (ay | 1); x_step = (int64)((uint64_t)dx << XY_SHIFT) / (ay | 1);
y_step = XY_ONE; y_step = XY_ONE;
pt2.y += XY_ONE; pt2.y += XY_ONE;
ecount = (int)((pt2.y >> XY_SHIFT) - (pt1.y >> XY_SHIFT)); ecount = (int)((pt2.y >> XY_SHIFT) - (pt1.y >> XY_SHIFT));

Write Preview
Loading…
Cancel
Save