Fix pointPolygonTest for large coordinate values (opencv#10222)

reunanen · vpisarev · commit 5b4159991158 · 2017-12-05T15:49:44.000+03:00
* Add test that fails

* Fix integer pointPolygonTest for large coordinate values

* Review fixes:
- change type from long long to int64
- move test code to test_contours.cpp, and make it C++98 compliant

* Hopefully fix compiler error by using push_back instead of emplace_back
diff --git a/modules/imgproc/src/geometry.cpp b/modules/imgproc/src/geometry.cpp
@@ -119,7 +119,6 @@ double cv::pointPolygonTest( InputArray _contour, Point2f pt, bool measureDist )
 
         for( i = 0; i < total; i++ )
         {
-            int dist;
             v0 = v;
             v = cnt[i];
 
@@ -133,7 +132,8 @@ double cv::pointPolygonTest( InputArray _contour, Point2f pt, bool measureDist )
                 continue;
             }
 
-            dist = (ip.y - v0.y)*(v.x - v0.x) - (ip.x - v0.x)*(v.y - v0.y);
+            int64 dist = static_cast<int64>(ip.y - v0.y)*(v.x - v0.x)
+                       - static_cast<int64>(ip.x - v0.x)*(v.y - v0.y);
             if( dist == 0 )
                 return 0;
             if( v.y < v0.y )
diff --git a/modules/imgproc/test/test_contours.cpp b/modules/imgproc/test/test_contours.cpp
@@ -485,4 +485,18 @@ TEST(Imgproc_FindContours, border)
     ASSERT_TRUE(norm(img - img_draw_contours, NORM_INF) == 0.0);
 }
 
+TEST(Imgproc_PointPolygonTest, regression_10222)
+{
+    vector<Point> contour;
+    contour.push_back(Point(0, 0));
+    contour.push_back(Point(0, 100000));
+    contour.push_back(Point(100000, 100000));
+    contour.push_back(Point(100000, 50000));
+    contour.push_back(Point(100000, 0));
+
+    const Point2f point(40000, 40000);
+    const double result = cv::pointPolygonTest(contour, point, false);
+    EXPECT_GT(result, 0) << "Desired result: point is inside polygon - actual result: point is not inside polygon";
+}
+
 /* End of file. */

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,6 @@ double cv::pointPolygonTest( InputArray _contour, Point2f pt, bool measureDist )`
`119`	`119`
`120`	`120`	`for( i = 0; i < total; i++ )`
`121`	`121`	`{`
`122`		`- int dist;`
`123`	`122`	`v0 = v;`
`124`	`123`	`v = cnt[i];`
`125`	`124`
`@@ -133,7 +132,8 @@ double cv::pointPolygonTest( InputArray _contour, Point2f pt, bool measureDist )`
`133`	`132`	`continue;`
`134`	`133`	`}`
`135`	`134`
`136`		`- dist = (ip.y - v0.y)(v.x - v0.x) - (ip.x - v0.x)(v.y - v0.y);`
	`135`	`+ int64 dist = static_cast<int64>(ip.y - v0.y)*(v.x - v0.x)`
	`136`	`+ - static_cast<int64>(ip.x - v0.x)*(v.y - v0.y);`
`137`	`137`	`if( dist == 0 )`
`138`	`138`	`return 0;`
`139`	`139`	`if( v.y < v0.y )`