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

fixed ~200 warnings for windows

Browse Source 
minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)
This commit is contained in:
Anatoly Baksheev
2012-02-14 10:22:34 +00:00
parent 8f4d63913a
commit 84db4eb6fa
29 changed files with 126 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -439,8 +439,8 @@ static char segSegInt( Point2f a, Point2f b, Point2f c, Point2f d, Point2f& p, P
(0.0 > t) || (t > 1.0) )
code = '0';
p.x = a.x + s * ( b.x - a.x );
p.y = a.y + s * ( b.y - a.y );
p.x = (float)(a.x + s * ( b.x - a.x ));
p.y = (float)(a.y + s * ( b.y - a.y ));
return code;
}
@@ -652,7 +652,7 @@ float cv::intersectConvexConvex( InputArray _p1, InputArray _p2, OutputArray _p1
_p12.release();
return 0.f;
}
area = contourArea(_InputArray(result, nr), false);
area = (float)contourArea(_InputArray(result, nr), false);
}
if( _p12.needed() )