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

re-enabled 16s images in cvSobel & cvLaplace.

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-09-29 07:32:02 +00:00
parent 87a21016d8
commit bf19d66bc2
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/imgproc/src/deriv.cpp
View File

@ -604,9 +604,7 @@ cvSobel( const void* srcarr, void* dstarr, int dx, int dy, int aperture_size )
{ {
cv::Mat src = cv::cvarrToMat(srcarr), dst = cv::cvarrToMat(dstarr); cv::Mat src = cv::cvarrToMat(srcarr), dst = cv::cvarrToMat(dstarr);
CV_Assert( src.size() == dst.size() && src.channels() == dst.channels() && CV_Assert( src.size() == dst.size() && src.channels() == dst.channels() );
((src.depth() == CV_8U && (dst.depth() == CV_16S || dst.depth() == CV_32F)) ||
(src.depth() == CV_32F && dst.depth() == CV_32F)));
cv::Sobel( src, dst, dst.depth(), dx, dy, aperture_size, 1, 0, cv::BORDER_REPLICATE ); cv::Sobel( src, dst, dst.depth(), dx, dy, aperture_size, 1, 0, cv::BORDER_REPLICATE );
if( CV_IS_IMAGE(srcarr) && ((IplImage*)srcarr)->origin && dy % 2 != 0 ) if( CV_IS_IMAGE(srcarr) && ((IplImage*)srcarr)->origin && dy % 2 != 0 )
@ -619,9 +617,7 @@ cvLaplace( const void* srcarr, void* dstarr, int aperture_size )
{ {
cv::Mat src = cv::cvarrToMat(srcarr), dst = cv::cvarrToMat(dstarr); cv::Mat src = cv::cvarrToMat(srcarr), dst = cv::cvarrToMat(dstarr);
CV_Assert( src.size() == dst.size() && src.channels() == dst.channels() && CV_Assert( src.size() == dst.size() && src.channels() == dst.channels() );
((src.depth() == CV_8U && (dst.depth() == CV_16S || dst.depth() == CV_32F)) ||
(src.depth() == CV_32F && dst.depth() == CV_32F)));
cv::Laplacian( src, dst, dst.depth(), aperture_size, 1, 0, cv::BORDER_REPLICATE ); cv::Laplacian( src, dst, dst.depth(), aperture_size, 1, 0, cv::BORDER_REPLICATE );
} }