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

fixed bug #1552

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-01-25 12:43:47 +00:00
parent 4f86af7e16
commit 18ce0dff24
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/imgproc/src/templmatch.cpp
View File

@ -44,7 +44,7 @@
namespace cv namespace cv
{ {
void crossCorr( const Mat& img, const Mat& templ, Mat& corr, void crossCorr( const Mat& img, const Mat& _templ, Mat& corr,
Size corrsize, int ctype, Size corrsize, int ctype,
Point anchor, double delta, int borderType ) Point anchor, double delta, int borderType )
{ {
@ -52,14 +52,21 @@ void crossCorr( const Mat& img, const Mat& templ, Mat& corr,
const int minBlockSize = 256; const int minBlockSize = 256;
std::vector<uchar> buf; std::vector<uchar> buf;
Mat templ = _templ;
int depth = img.depth(), cn = img.channels(); int depth = img.depth(), cn = img.channels();
int tdepth = templ.depth(), tcn = templ.channels(); int tdepth = templ.depth(), tcn = templ.channels();
int cdepth = CV_MAT_DEPTH(ctype), ccn = CV_MAT_CN(ctype); int cdepth = CV_MAT_DEPTH(ctype), ccn = CV_MAT_CN(ctype);
CV_Assert( img.dims <= 2 && templ.dims <= 2 && corr.dims <= 2 ); CV_Assert( img.dims <= 2 && templ.dims <= 2 && corr.dims <= 2 );
CV_Assert( depth == CV_8U || depth == CV_16U || depth == CV_32F || depth == CV_64F ); CV_Assert( depth == CV_8U || depth == CV_16U || depth == CV_32F || depth == CV_64F );
CV_Assert( depth == tdepth || tdepth == CV_32F );
if( depth != tdepth && tdepth != std::max(CV_32F, depth) )
{
_templ.convertTo(templ, std::max(CV_32F, depth));
tdepth = templ.depth();
}
CV_Assert( depth == tdepth || tdepth == CV_32F);
CV_Assert( corrsize.height <= img.rows + templ.rows - 1 && CV_Assert( corrsize.height <= img.rows + templ.rows - 1 &&
corrsize.width <= img.cols + templ.cols - 1 ); corrsize.width <= img.cols + templ.cols - 1 );