third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added downsample function into gpu module, refactored it a little bit, added guard for CUDA related include in cascadeclassifier_nvidia_api.cpp

Browse Source
This commit is contained in:
Alexey Spizhevoy
2011-04-08 08:04:56 +00:00
parent 6cec5ff552
commit 97282d8ff8
8 changed files with 127 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gpu/src/blend.cpp
+3 -3
View File
@@ -63,8 +63,8 @@ namespace cv { namespace gpu
const PtrStepf weights1, const PtrStepf weights2, PtrStep result);
}}
void cv::gpu::blendLinear(const GpuMat& img1, const GpuMat& img2,
const GpuMat& weights1, const GpuMat& weights2, GpuMat& result)
void cv::gpu::blendLinear(const GpuMat& img1, const GpuMat& img2, const GpuMat& weights1, const GpuMat& weights2,
GpuMat& result)
{
CV_Assert(img1.size() == img2.size());
CV_Assert(img1.type() == img2.type());
@@ -94,7 +94,7 @@ void cv::gpu::blendLinear(const GpuMat& img1, const GpuMat& img2,
(const PtrStepf)weights1, (const PtrStepf)weights2, (PtrStepf)result);
break;
default:
CV_Error(CV_StsBadArg, "unsupported image depth in linear blending method");
CV_Error(CV_StsUnsupportedFormat, "bad image depth in linear blending function");
}
}