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

switched to Input/Output Array in reductions operations

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-04-26 14:40:44 +04:00
parent c52d56964c
commit 8fcef225fb
11 changed files with 299 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/gpu/driver_api_multi.cpp
View File

@@ -138,7 +138,7 @@ void Worker::operator()(int device_id) const
gpu::transpose(d_src, d_dst);
// Check results
bool passed = norm(dst - Mat(d_dst), NORM_INF) < 1e-3;
bool passed = cv::norm(dst - Mat(d_dst), NORM_INF) < 1e-3;
std::cout << "GPU #" << device_id << " (" << DeviceInfo().name() << "): "
<< (passed ? "passed" : "FAILED") << endl;

4
samples/gpu/farneback_optical_flow.cpp
View File

@@ -22,9 +22,9 @@ inline T mapVal(T x, T a, T b, T c, T d)
static void colorizeFlow(const Mat &u, const Mat &v, Mat &dst)
{
double uMin, uMax;
minMaxLoc(u, &uMin, &uMax, 0, 0);
cv::minMaxLoc(u, &uMin, &uMax, 0, 0);
double vMin, vMax;
minMaxLoc(v, &vMin, &vMax, 0, 0);
cv::minMaxLoc(v, &vMin, &vMax, 0, 0);
uMin = ::abs(uMin); uMax = ::abs(uMax);
vMin = ::abs(vMin); vMax = ::abs(vMax);
float dMax = static_cast<float>(::max(::max(uMin, uMax), ::max(vMin, vMax)));

2
samples/gpu/multi.cpp
View File

@@ -95,7 +95,7 @@ void Worker::operator()(int device_id) const
gpu::transpose(d_src, d_dst);
// Check results
bool passed = norm(dst - Mat(d_dst), NORM_INF) < 1e-3;
bool passed = cv::norm(dst - Mat(d_dst), NORM_INF) < 1e-3;
std::cout << "GPU #" << device_id << " (" << DeviceInfo().name() << "): "
<< (passed ? "passed" : "FAILED") << endl;