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

Fixed number of warnings. Fixed mingw64 build.

Browse Source
This commit is contained in:
Andrey Kamaev
2012-06-12 14:46:12 +00:00
parent 02e3afae3a
commit c5aba337e9
110 changed files with 2232 additions and 2367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/test/test_arithm.cpp
View File

@@ -1264,7 +1264,7 @@ struct NormOp : public BaseElemWiseOp
dst.at<double>(0,0) = cvtest::norm(src[0], normType, mask);
dst.at<double>(0,1) = cvtest::norm(src[0], src[1], normType, mask);
}
void generateScalars(int, RNG& rng)
void generateScalars(int, RNG& /*rng*/)
{
}
double getMaxErr(int)

7
modules/core/test/test_ds.cpp
View File

@@ -2023,14 +2023,7 @@ void Core_GraphScanTest::run( int )
event = "End of procedure";
break;
default:
#if defined _MSC_VER && _MSC_VER >= 1200
#pragma warning( push )
#pragma warning( disable : 4127 )
#endif
CV_TS_SEQ_CHECK_CONDITION( 0, "Invalid code appeared during graph scan" );
#if defined _MSC_VER && _MSC_VER >= 1200
#pragma warning( pop )
#endif
}
ts->printf( cvtest::TS::LOG, "%s", event );