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

fixed pointPolygonTest(). Now it returns -1, 0, 1 when measureDist=false (ticket #1285)

Browse Source
pull/13383/head
Vadim Pisarevsky 14 years ago
parent 99e3b5a24e
commit e5c66b5ed4
1 changed files with 3 additions and 3 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. 6
      modules/imgproc/src/geometry.cpp

6
modules/imgproc/src/geometry.cpp
Unescape View File

@ -169,7 +169,7 @@ cvPointPolygonTest( const CvArr* _contour, CvPoint2D32f pt, int measure_dist )
CvRect r = ((CvContour*)contour)->rect; CvRect r = ((CvContour*)contour)->rect;
if( pt.x < r.x || pt.y < r.y || if( pt.x < r.x || pt.y < r.y ||
pt.x >= r.x + r.width || pt.y >= r.y + r.height ) pt.x >= r.x + r.width || pt.y >= r.y + r.height )
return -100; return -1;
} }
} }
else if( CV_IS_SEQ_CHAIN(contour) ) else if( CV_IS_SEQ_CHAIN(contour) )
@ -214,7 +214,7 @@ cvPointPolygonTest( const CvArr* _contour, CvPoint2D32f pt, int measure_dist )
counter += dist > 0; counter += dist > 0;
} }
result = counter % 2 == 0 ? -100 : 100; result = counter % 2 == 0 ? -1 : 1;
} }
else else
{ {
@ -265,7 +265,7 @@ cvPointPolygonTest( const CvArr* _contour, CvPoint2D32f pt, int measure_dist )
counter += dist > 0; counter += dist > 0;
} }
result = counter % 2 == 0 ? -100 : 100; result = counter % 2 == 0 ? -1 : 1;
} }
else else
{ {

Write Preview
Loading…
Cancel
Save