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

bug fix

Browse Source
This commit is contained in:
mlyashko
2014-03-31 10:58:15 +04:00
parent 4b71921526
commit 4c5de04efb
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/imgproc/test/ocl/test_histogram.cpp
View File

@@ -154,15 +154,16 @@ PARAM_TEST_CASE(CalcBackProject, MatDepth, int, bool)
frame1.copyTo(usrc); frame1.copyTo(usrc);
int histSize = randomInt(3, 29); int histSize = randomInt(3, 29);
float hue_range[] = { 0, 180 }; float hue_range[] = { 0, 180 };
const float* ranges = { hue_range }; const float* ranges1 = { hue_range };
Mat hist1;
//compute histogram //compute histogram
calcHist(&frame1, 1, 0, Mat(), hist, 1, &histSize, &ranges, true, false); calcHist(&frame1, 1, 0, Mat(), hist1, 1, &histSize, &ranges1, true, false);
normalize(hist, hist, 0, 255, NORM_MINMAX, -1, Mat()); normalize(hist1, hist1, 0, 255, NORM_MINMAX, -1, Mat());
Mat dst; Mat dst1;
UMat udst, src, uhist; UMat udst1, src, uhist1;
hist.copyTo(uhist); hist1.copyTo(uhist1);
std::vector<UMat> uims; std::vector<UMat> uims;
uims.push_back(usrc); uims.push_back(usrc);
std::vector<float> urngs; std::vector<float> urngs;
@@ -171,9 +172,9 @@ PARAM_TEST_CASE(CalcBackProject, MatDepth, int, bool)
std::vector<int> chs; std::vector<int> chs;
chs.push_back(0); chs.push_back(0);
OCL_OFF(calcBackProject(&frame1, 1, 0, hist, dst, &ranges, 1, true)); OCL_OFF(calcBackProject(&frame1, 1, 0, hist1, dst1, &ranges1, 1, true));
OCL_ON(calcBackProject(uims, chs, uhist, udst, urngs, 1.0)); OCL_ON(calcBackProject(uims, chs, uhist1, udst1, urngs, 1.0));
EXPECT_MAT_NEAR(dst, udst, 0.0); EXPECT_MAT_NEAR(dst1, udst1, 0.0);
} }
}; };