projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5728612
)
Removed trailing whitespace
author
Jin Ma
<jinma06njuee@gmail.om>
Thu, 29 Aug 2013 06:08:56 +0000
(14:08 +0800)
committer
Jin Ma
<jinma06njuee@gmail.om>
Thu, 29 Aug 2013 06:09:00 +0000
(14:09 +0800)
modules/ocl/test/utility.cpp
patch
|
blob
|
history
diff --git
a/modules/ocl/test/utility.cpp
b/modules/ocl/test/utility.cpp
index
750c3c8
..
5d31957
100644
(file)
--- a/
modules/ocl/test/utility.cpp
+++ b/
modules/ocl/test/utility.cpp
@@
-119,7
+119,7
@@
cv::ocl::oclMat createMat_ocl(Size size, int type, bool useRoi)
}
cv::ocl::oclMat loadMat_ocl(const Mat& m, bool useRoi)
-{
+{
CV_Assert(m.type() == CV_8UC1 || m.type() == CV_8UC3);
cv::ocl::oclMat d_m;
d_m = createMat_ocl(m.size(), m.type(), useRoi);
@@
-130,11
+130,11
@@
cv::ocl::oclMat loadMat_ocl(const Mat& m, bool useRoi)
d_m.locateROI(ls, pt);
Rect roi(pt.x, pt.y, d_m.size().width, d_m.size().height);
-
+
cv::ocl::oclMat m_ocl(m);
cv::ocl::oclMat d_m_roi(d_m, roi);
-
+
m_ocl.copyTo(d_m);
return d_m;
}
@@
-289,4
+289,3
@@
double checkRectSimilarity(Size sz, std::vector<Rect>& ob1, std::vector<Rect>& o
}
return final_test_result;
}
-