generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed bug #2186 (thanks to Joao Soares for the patch)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-09-11 13:56:25 +04:00
parent fbd9bfba47
commit b3408a9b3a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/imgproc/src/approx.cpp
View File

@ -642,13 +642,17 @@ icvApproxPolyDP( CvSeq* src_contour, int header_size,
new_count = count = dst_contour->total; new_count = count = dst_contour->total;
for( i = !is_closed; i < count - !is_closed && new_count > 2; i++ ) for( i = !is_closed; i < count - !is_closed && new_count > 2; i++ )
{ {
double dx, dy, dist; double dx, dy, dist, successive_inner_product;
CV_READ_SEQ_ELEM( end_pt, reader ); CV_READ_SEQ_ELEM( end_pt, reader );
dx = end_pt.x - start_pt.x; dx = end_pt.x - start_pt.x;
dy = end_pt.y - start_pt.y; dy = end_pt.y - start_pt.y;
dist = fabs((pt.x - start_pt.x)*dy - (pt.y - start_pt.y)*dx); dist = fabs((pt.x - start_pt.x)*dy - (pt.y - start_pt.y)*dx);
if( dist * dist <= 0.5*eps*(dx*dx + dy*dy) && dx != 0 && dy != 0 ) successive_inner_product = (pt.x - start_pt.x) * (end_pt.x - pt.x) +
(pt.y - start_pt.y) * (end_pt.y - pt.y);
if( dist * dist <= 0.5*eps*(dx*dx + dy*dy) && dx != 0 && dy != 0 &&
successive_inner_product >= 0 )
{ {
new_count--; new_count--;
*((PT*)reader2.ptr) = start_pt = end_pt; *((PT*)reader2.ptr) = start_pt = end_pt;

4
modules/imgproc/src/generalized_hough.cpp
View File

@ -64,10 +64,10 @@ namespace
{ {
return fabs(v) > numeric_limits<float>::epsilon(); return fabs(v) > numeric_limits<float>::epsilon();
} }
bool notNull(double v) /*bool notNull(double v)
{ {
return fabs(v) > numeric_limits<double>::epsilon(); return fabs(v) > numeric_limits<double>::epsilon();
} }*/
class GHT_Pos : public GeneralizedHough class GHT_Pos : public GeneralizedHough
{ {