potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #7428 from alalek:cmake_fix_compiler_flags_detection

Browse Source
This commit is contained in:
Vadim Pisarevsky
2016-10-12 19:38:25 +00:00
parent 994815fbd4 714db4cf0d
commit 4acda3f609
20 changed files with 66 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/test/ocl/test_arithm.cpp
+6 -6
View File
@@ -134,7 +134,7 @@ PARAM_TEST_CASE(ArithmTestBase, MatDepth, Channels, bool)
use_roi = GET_PARAM(2);
}
virtual void generateTestData(bool with_val_in_range = false)
void generateTestData(bool with_val_in_range = false)
{
const int type = CV_MAKE_TYPE(depth, cn);
@@ -897,7 +897,7 @@ struct RepeatTestCase :
{
int nx, ny;
virtual void generateTestData()
void generateTestData()
{
const int type = CV_MAKE_TYPE(depth, cn);
@@ -1495,7 +1495,7 @@ PARAM_TEST_CASE(InRange, MatDepth, Channels, bool /*Scalar or not*/, bool /*Roi*
use_roi = GET_PARAM(3);
}
virtual void generateTestData()
void generateTestData()
{
const int type = CV_MAKE_TYPE(depth, cn);
@@ -1574,7 +1574,7 @@ PARAM_TEST_CASE(ConvertScaleAbs, MatDepth, Channels, bool)
use_roi = GET_PARAM(2);
}
virtual void generateTestData()
void generateTestData()
{
const int stype = CV_MAKE_TYPE(depth, cn);
const int dtype = CV_MAKE_TYPE(CV_8U, cn);
@@ -1647,7 +1647,7 @@ PARAM_TEST_CASE(PatchNaNs, Channels, bool)
use_roi = GET_PARAM(1);
}
virtual void generateTestData()
void generateTestData()
{
const int type = CV_MAKE_TYPE(CV_32F, cn);
@@ -1727,7 +1727,7 @@ PARAM_TEST_CASE(Reduce, std::pair<MatDepth, MatDepth>, Channels, int, bool)
use_roi = GET_PARAM(3);
}
virtual void generateTestData()
void generateTestData()
{
const int stype = CV_MAKE_TYPE(sdepth, cn);
dtype = CV_MAKE_TYPE(ddepth, cn);
modules/core/test/ocl/test_matrix_operation.cpp
+1 -1
View File
@@ -71,7 +71,7 @@ PARAM_TEST_CASE(ConvertTo, MatDepth, MatDepth, Channels, bool)
use_roi = GET_PARAM(3);
}
virtual void generateTestData()
void generateTestData()
{
Size roiSize = randomSize(1, MAX_VALUE);
Border srcBorder = randomBorder(0, use_roi ? MAX_VALUE : 0);
modules/core/test/test_ippasync.cpp
+2 -2
View File
@@ -32,7 +32,7 @@ PARAM_TEST_CASE(IPPAsync, MatDepth, Channels, hppAccelType)
accelType = GET_PARAM(2);
}
virtual void generateTestData()
void generateTestData()
{
Size matrix_Size = randomSize(2, 100);
const double upValue = 100;
@@ -102,7 +102,7 @@ PARAM_TEST_CASE(IPPAsyncShared, Channels, hppAccelType)
type=CV_MAKE_TYPE(CV_8U, GET_PARAM(0));
}
virtual void generateTestData()
void generateTestData()
{
Size matrix_Size = randomSize(2, 100);
hpp32u pitch, size;