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

added buffered version of norm, updated performance sample and docs

Browse Source
This commit is contained in:
Alexey Spizhevoy
2011-02-01 10:46:19 +00:00
parent 3795142604
commit 16e74ab306
4 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gpu/include/opencv2/gpu/gpu.hpp
View File

@@ -750,9 +750,14 @@ namespace cv
//! computes norm of array
//! supports NORM_INF, NORM_L1, NORM_L2
//! supports only CV_8UC1 type
//! supports all matrices except 64F
CV_EXPORTS double norm(const GpuMat& src1, int normType=NORM_L2);
//! computes norm of array
//! supports NORM_INF, NORM_L1, NORM_L2
//! supports all matrices except 64F
CV_EXPORTS double norm(const GpuMat& src1, int normType, GpuMat& buf);
//! computes norm of the difference between two arrays
//! supports NORM_INF, NORM_L1, NORM_L2
//! supports only CV_8UC1 type

13
modules/gpu/src/matrix_reductions.cpp
View File

@@ -49,6 +49,7 @@ using namespace cv::gpu;
void cv::gpu::meanStdDev(const GpuMat&, Scalar&, Scalar&) { throw_nogpu(); }
double cv::gpu::norm(const GpuMat&, int) { throw_nogpu(); return 0.0; }
double cv::gpu::norm(const GpuMat&, int, GpuMat&) { throw_nogpu(); return 0.0; }
double cv::gpu::norm(const GpuMat&, const GpuMat&, int) { throw_nogpu(); return 0.0; }
Scalar cv::gpu::sum(const GpuMat&) { throw_nogpu(); return Scalar(); }
Scalar cv::gpu::sum(const GpuMat&, GpuMat&) { throw_nogpu(); return Scalar(); }
@@ -87,19 +88,25 @@ void cv::gpu::meanStdDev(const GpuMat& src, Scalar& mean, Scalar& stddev)
// norm
double cv::gpu::norm(const GpuMat& src, int normType)
{
GpuMat buf;
return norm(src, normType, buf);
}
double cv::gpu::norm(const GpuMat& src, int normType, GpuMat& buf)
{
GpuMat src_single_channel = src.reshape(1);
if (normType == NORM_L1)
return absSum(src_single_channel)[0];
return absSum(src_single_channel, buf)[0];
if (normType == NORM_L2)
return sqrt(sqrSum(src_single_channel)[0]);
return sqrt(sqrSum(src_single_channel, buf)[0]);
if (normType == NORM_INF)
{
double min_val, max_val;
minMax(src_single_channel, &min_val, &max_val);
minMax(src_single_channel, &min_val, &max_val, GpuMat(), buf);
return std::max(std::abs(min_val), std::abs(max_val));
}