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

8
modules/gpu/test/test_features2d.cpp
View File

@@ -267,7 +267,7 @@ TEST_P(BruteForceMatcher, MatchAdd)
cv::DMatch match = matches[i];
int shift = isMaskSupported ? 1 : 0;
{
if (i < queryDescCount / 2)
if ((int)i < queryDescCount / 2)
{
if ((match.queryIdx != (int)i) || (match.trainIdx != (int)i * countFactor + shift) || (match.imgIdx != 0))
badCount++;
@@ -390,7 +390,7 @@ TEST_P(BruteForceMatcher, KnnMatchAdd2)
{
cv::DMatch match = matches[i][k];
{
if (i < queryDescCount / 2)
if ((int)i < queryDescCount / 2)
{
if ((match.queryIdx != (int)i) || (match.trainIdx != (int)i * countFactor + k + shift) || (match.imgIdx != 0) )
localBadCount++;
@@ -452,7 +452,7 @@ TEST_P(BruteForceMatcher, KnnMatchAdd3)
{
cv::DMatch match = matches[i][k];
{
if (i < queryDescCount / 2)
if ((int)i < queryDescCount / 2)
{
if ((match.queryIdx != (int)i) || (match.trainIdx != (int)i * countFactor + k + shift) || (match.imgIdx != 0) )
localBadCount++;
@@ -552,7 +552,7 @@ TEST_P(BruteForceMatcher, RadiusMatchAdd)
{
cv::DMatch match = matches[i][k];
{
if (i < queryDescCount / 2)
if ((int)i < queryDescCount / 2)
{
if ((match.queryIdx != (int)i) || (match.trainIdx != (int)i * countFactor + k + shift) || (match.imgIdx != 0) )
localBadCount++;