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

Merge pull request #1567 from ilya-lavrenov:warn_fix

Browse Source
This commit is contained in:
Roman Donchenko
2013-10-08 13:50:49 +04:00
committed by OpenCV Buildbot
parent b08233a3ca 35d9ce0c0c
commit 685eceb68a
23 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/imgproc/src/intersection.cpp
View File

@@ -49,7 +49,7 @@ namespace cv
int rotatedRectangleIntersection( const RotatedRect& rect1, const RotatedRect& rect2, OutputArray intersectingRegion )
{
const float samePointEps = 0.00001; // used to test if two points are the same
const float samePointEps = 0.00001f; // used to test if two points are the same
Point2f vec1[4], vec2[4];
Point2f pts1[4], pts2[4];

3
modules/imgproc/src/lsd.cpp
View File

@@ -473,8 +473,7 @@ void LineSegmentDetectorImpl::flsd(std::vector<Vec4i>& lines,
// Search for line segments
unsigned int ls_count = 0;
unsigned int list_size = list.size();
for(unsigned int i = 0; i < list_size; ++i)
for(size_t i = 0, list_size = list.size(); i < list_size; ++i)
{
unsigned int adx = list[i].p.x + list[i].p.y * img_width;
if((used.data[adx] == NOTUSED) && (angles_data[adx] != NOTDEF))