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

added checking destination matrix size for resize and integral functions

Browse Source
This commit is contained in:
Marina Kolpakova 2012-07-04 16:03:43 +00:00
parent 6c0af66fd8
commit eb599f6832
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gpu/src/imgproc.cpp
View File

@ -530,8 +530,8 @@ void cv::gpu::integral(const GpuMat& src, GpuMat& sum, Stream& s)
void cv::gpu::integralBuffered(const GpuMat& src, GpuMat& sum, GpuMat& buffer, Stream& s) void cv::gpu::integralBuffered(const GpuMat& src, GpuMat& sum, GpuMat& buffer, Stream& s)
{ {
CV_Assert(src.type() == CV_8UC1); CV_Assert(src.type() == CV_8UC1);
if (sum.cols != src.cols + 1 && sum.rows != src.rows + 1)
sum.create(src.rows + 1, src.cols + 1, CV_32S); sum.create(src.rows + 1, src.cols + 1, CV_32S);
NcvSize32u roiSize; NcvSize32u roiSize;
roiSize.width = src.cols; roiSize.width = src.cols;

4
modules/gpu/src/resize.cpp
View File

@ -83,8 +83,8 @@ void cv::gpu::resize(const GpuMat& src, GpuMat& dst, Size dsize, double fx, doub
fx = static_cast<double>(dsize.width) / src.cols; fx = static_cast<double>(dsize.width) / src.cols;
fy = static_cast<double>(dsize.height) / src.rows; fy = static_cast<double>(dsize.height) / src.rows;
} }
if (dsize != dst.size())
dst.create(dsize, src.type()); dst.create(dsize, src.type());
if (dsize == src.size()) if (dsize == src.size())
{ {