Skip to content

O
Opencv

Greenplum / Opencv
11 个月 前同步成功

通知 7
Star 0
Fork 0
O
Opencv

体验新版 GitCode，发现更多精彩内容 >>

提交 bf19d66b 编写于 作者: V Vadim Pisarevsky
浏览文件
操作

re-enabled 16s images in cvSobel & cvLaplace.

上级 87a21016
隐藏空白更改
内联 并排
Showing with 2 addition and 6 deletion
modules/imgproc/src/deriv.cpp
浏览文件 @ bf19d66b
......@@ -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_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_Assert( src.size() == dst.size() && src.channels() == dst.channels() );
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 )
......@@ -619,9 +617,7 @@ cvLaplace( const void* srcarr, void* dstarr, int aperture_size )
{
cv::Mat src = cv::cvarrToMat(srcarr), dst = cv::cvarrToMat(dstarr);
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_Assert( src.size() == dst.size() && src.channels() == dst.channels() );
cv::Laplacian( src, dst, dst.depth(), aperture_size, 1, 0, cv::BORDER_REPLICATE );
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或