Fixed 2 spontaneously failing tests

This commit is contained in:
Andrey Kamaev 2012-03-29 03:05:41 +00:00
parent f5152500be
commit 700c1665c9
2 changed files with 4 additions and 4 deletions

View File

@ -1448,7 +1448,7 @@ protected:
compare(mask, 0, mask1, CMP_EQ);
a1.setTo(0, mask1);
b1.setTo(0, mask1);
if( op == 0 )
{
add(a, b, c, mask);
@ -1476,12 +1476,12 @@ protected:
}
Mat d1;
d.convertTo(d1, depth);
CV_Assert( norm(c, d1, CV_C) == 0 );
CV_Assert( norm(c, d1, CV_C) <= DBL_EPSILON );
}
}
catch(...)
{
ts->set_failed_test_info(cvtest::TS::FAIL_MISMATCH);
ts->set_failed_test_info(cvtest::TS::FAIL_MISMATCH);
}
}
};

View File

@ -89,7 +89,7 @@ template <typename T> cv::Rect CV_BoundingRectTest::get_bounding_rect(const vect
max_h = std::max<T>(src.at(i).y, max_h);
}
return Rect((int)min_w, (int)min_h, (int)(floor(1.0*(max_w-min_w)) + 1), (int)(floor(1.0*(max_h-min_h)) + 1));
return Rect((int)min_w, (int)min_h, (int)max_w-(int)min_w + 1, (int)max_h-(int)min_h + 1);
}
template <typename T> bool CV_BoundingRectTest::checking_function_work(vector <Point_<T> >& src, int type)