From e5c66b5ed48232f73f132aa27ddec3cd321487b3 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Sun, 7 Aug 2011 16:58:29 +0000 Subject: [PATCH] fixed pointPolygonTest(). Now it returns -1, 0, 1 when measureDist=false (ticket #1285) --- modules/imgproc/src/geometry.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/imgproc/src/geometry.cpp b/modules/imgproc/src/geometry.cpp index b12d098486..ab0bc7565d 100644 --- a/modules/imgproc/src/geometry.cpp +++ b/modules/imgproc/src/geometry.cpp @@ -169,7 +169,7 @@ cvPointPolygonTest( const CvArr* _contour, CvPoint2D32f pt, int measure_dist ) CvRect r = ((CvContour*)contour)->rect; if( pt.x < r.x || pt.y < r.y || pt.x >= r.x + r.width || pt.y >= r.y + r.height ) - return -100; + return -1; } } else if( CV_IS_SEQ_CHAIN(contour) ) @@ -214,7 +214,7 @@ cvPointPolygonTest( const CvArr* _contour, CvPoint2D32f pt, int measure_dist ) counter += dist > 0; } - result = counter % 2 == 0 ? -100 : 100; + result = counter % 2 == 0 ? -1 : 1; } else { @@ -265,7 +265,7 @@ cvPointPolygonTest( const CvArr* _contour, CvPoint2D32f pt, int measure_dist ) counter += dist > 0; } - result = counter % 2 == 0 ? -100 : 100; + result = counter % 2 == 0 ? -1 : 1; } else {