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

Fixed cmake and build issues when using Visual Studio 2015

Browse Source
This commit is contained in:
Maksim Shabunin
2015-10-26 16:55:42 +03:00
parent 4552ca98c4
commit f49936a849
59 changed files with 520 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/ocl/test/test_ml.cpp
View File

@@ -142,12 +142,12 @@ PARAM_TEST_CASE(SVM_OCL, int, int, int)
kernel_type = GET_PARAM(0);
svm_type = GET_PARAM(1);
K = GET_PARAM(2);
cv::Size size = cv::Size(MWIDTH, MHEIGHT);
src.create(size, CV_32FC1);
labels.create(1, size.height, CV_32SC1);
cv::Size sz = cv::Size(MWIDTH, MHEIGHT);
src.create(sz, CV_32FC1);
labels.create(1, sz.height, CV_32SC1);
int row_idx = 0;
const int max_number = size.height / K - 1;
CV_Assert(K <= size.height);
const int max_number = sz.height / K - 1;
CV_Assert(K <= sz.height);
for(int i = 0; i < K; i++ )
{
Mat center_row_header = src.row(row_idx);
@@ -159,7 +159,7 @@ PARAM_TEST_CASE(SVM_OCL, int, int, int)
}
labels.at<int>(0, row_idx) = i;
for(int j = 0; (j < max_number) ||
(i == K - 1 && j < max_number + size.height % K); j ++)
(i == K - 1 && j < max_number + sz.height % K); j ++)
{
Mat cur_row_header = src.row(row_idx + 1 + j);
center_row_header.copyTo(cur_row_header);