Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
f7bebe82
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f7bebe82
编写于
10月 20, 2010
作者:
V
Vadim Pisarevsky
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed several warnings; modified size comparison: m1.size() == m2.size() => m1.size == m2.size
上级
61ecedd3
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
37 addition
and
37 deletion
+37
-37
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/core.hpp
+2
-2
modules/core/src/arithm.cpp
modules/core/src/arithm.cpp
+24
-24
modules/core/src/convert.cpp
modules/core/src/convert.cpp
+3
-3
modules/core/src/copy.cpp
modules/core/src/copy.cpp
+1
-1
modules/core/src/dxt.cpp
modules/core/src/dxt.cpp
+3
-3
modules/core/src/mathfuncs.cpp
modules/core/src/mathfuncs.cpp
+3
-3
modules/core/src/matmul.cpp
modules/core/src/matmul.cpp
+1
-1
未找到文件。
modules/core/include/opencv2/core/core.hpp
浏览文件 @
f7bebe82
...
...
@@ -199,11 +199,11 @@ CV_EXPORTS ErrorCallback redirectError( ErrorCallback errCallback,
#ifdef __GNUC__
#define CV_Error( code, msg ) cv::error( cv::Exception(code, msg, __func__, __FILE__, __LINE__) )
#define CV_Error_( code, args ) cv::error( cv::Exception(code, cv::format args, __func__, __FILE__, __LINE__) )
#define CV_Assert( expr )
{ if(!(expr)) cv::error( cv::Exception(CV_StsAssert, #expr, __func__, __FILE__, __LINE__) ); }
#define CV_Assert( expr )
do { if(!(expr)) cv::error( cv::Exception(CV_StsAssert, #expr, __func__, __FILE__, __LINE__) ); } while(0)
#else
#define CV_Error( code, msg ) cv::error( cv::Exception(code, msg, "", __FILE__, __LINE__) )
#define CV_Error_( code, args ) cv::error( cv::Exception(code, cv::format args, "", __FILE__, __LINE__) )
#define CV_Assert( expr )
{ if(!(expr)) cv::error( cv::Exception(CV_StsAssert, #expr, "", __FILE__, __LINE__) ); }
#define CV_Assert( expr )
do { if(!(expr)) cv::error( cv::Exception(CV_StsAssert, #expr, "", __FILE__, __LINE__) ); } while(0)
#endif
#ifdef _DEBUG
...
...
modules/core/src/arithm.cpp
浏览文件 @
f7bebe82
...
...
@@ -1700,7 +1700,7 @@ CV_IMPL void
cvNot
(
const
CvArr
*
srcarr
,
CvArr
*
dstarr
)
{
cv
::
Mat
src
=
cv
::
cvarrToMat
(
srcarr
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src
.
size
()
==
dst
.
size
()
&&
src
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src
.
size
==
dst
.
size
&&
src
.
type
()
==
dst
.
type
()
);
cv
::
bitwise_not
(
src
,
dst
);
}
...
...
@@ -1710,7 +1710,7 @@ cvAnd( const CvArr* srcarr1, const CvArr* srcarr2, CvArr* dstarr, const CvArr* m
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
src2
=
cv
::
cvarrToMat
(
srcarr2
),
dst
=
cv
::
cvarrToMat
(
dstarr
),
mask
;
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
if
(
maskarr
)
mask
=
cv
::
cvarrToMat
(
maskarr
);
cv
::
bitwise_and
(
src1
,
src2
,
dst
,
mask
);
...
...
@@ -1721,7 +1721,7 @@ cvOr( const CvArr* srcarr1, const CvArr* srcarr2, CvArr* dstarr, const CvArr* ma
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
src2
=
cv
::
cvarrToMat
(
srcarr2
),
dst
=
cv
::
cvarrToMat
(
dstarr
),
mask
;
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
if
(
maskarr
)
mask
=
cv
::
cvarrToMat
(
maskarr
);
cv
::
bitwise_or
(
src1
,
src2
,
dst
,
mask
);
...
...
@@ -1733,7 +1733,7 @@ cvXor( const CvArr* srcarr1, const CvArr* srcarr2, CvArr* dstarr, const CvArr* m
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
src2
=
cv
::
cvarrToMat
(
srcarr2
),
dst
=
cv
::
cvarrToMat
(
dstarr
),
mask
;
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
if
(
maskarr
)
mask
=
cv
::
cvarrToMat
(
maskarr
);
cv
::
bitwise_xor
(
src1
,
src2
,
dst
,
mask
);
...
...
@@ -1744,7 +1744,7 @@ CV_IMPL void
cvAndS
(
const
CvArr
*
srcarr
,
CvScalar
s
,
CvArr
*
dstarr
,
const
CvArr
*
maskarr
)
{
cv
::
Mat
src
=
cv
::
cvarrToMat
(
srcarr
),
dst
=
cv
::
cvarrToMat
(
dstarr
),
mask
;
CV_Assert
(
src
.
size
()
==
dst
.
size
()
&&
src
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src
.
size
==
dst
.
size
&&
src
.
type
()
==
dst
.
type
()
);
if
(
maskarr
)
mask
=
cv
::
cvarrToMat
(
maskarr
);
cv
::
bitwise_and
(
src
,
s
,
dst
,
mask
);
...
...
@@ -1755,7 +1755,7 @@ CV_IMPL void
cvOrS
(
const
CvArr
*
srcarr
,
CvScalar
s
,
CvArr
*
dstarr
,
const
CvArr
*
maskarr
)
{
cv
::
Mat
src
=
cv
::
cvarrToMat
(
srcarr
),
dst
=
cv
::
cvarrToMat
(
dstarr
),
mask
;
CV_Assert
(
src
.
size
()
==
dst
.
size
()
&&
src
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src
.
size
==
dst
.
size
&&
src
.
type
()
==
dst
.
type
()
);
if
(
maskarr
)
mask
=
cv
::
cvarrToMat
(
maskarr
);
cv
::
bitwise_or
(
src
,
s
,
dst
,
mask
);
...
...
@@ -1766,7 +1766,7 @@ CV_IMPL void
cvXorS
(
const
CvArr
*
srcarr
,
CvScalar
s
,
CvArr
*
dstarr
,
const
CvArr
*
maskarr
)
{
cv
::
Mat
src
=
cv
::
cvarrToMat
(
srcarr
),
dst
=
cv
::
cvarrToMat
(
dstarr
),
mask
;
CV_Assert
(
src
.
size
()
==
dst
.
size
()
&&
src
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src
.
size
==
dst
.
size
&&
src
.
type
()
==
dst
.
type
()
);
if
(
maskarr
)
mask
=
cv
::
cvarrToMat
(
maskarr
);
cv
::
bitwise_xor
(
src
,
s
,
dst
,
mask
);
...
...
@@ -1776,7 +1776,7 @@ CV_IMPL void cvAdd( const CvArr* srcarr1, const CvArr* srcarr2, CvArr* dstarr, c
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
src2
=
cv
::
cvarrToMat
(
srcarr2
),
dst
=
cv
::
cvarrToMat
(
dstarr
),
mask
;
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
if
(
maskarr
)
mask
=
cv
::
cvarrToMat
(
maskarr
);
cv
::
add
(
src1
,
src2
,
dst
,
mask
);
...
...
@@ -1786,7 +1786,7 @@ CV_IMPL void cvSub( const CvArr* srcarr1, const CvArr* srcarr2, CvArr* dstarr, c
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
src2
=
cv
::
cvarrToMat
(
srcarr2
),
dst
=
cv
::
cvarrToMat
(
dstarr
),
mask
;
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
if
(
maskarr
)
mask
=
cv
::
cvarrToMat
(
maskarr
);
cv
::
subtract
(
src1
,
src2
,
dst
,
mask
);
...
...
@@ -1796,7 +1796,7 @@ CV_IMPL void cvAddS( const CvArr* srcarr1, CvScalar value, CvArr* dstarr, const
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
dst
=
cv
::
cvarrToMat
(
dstarr
),
mask
;
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
if
(
maskarr
)
mask
=
cv
::
cvarrToMat
(
maskarr
);
cv
::
add
(
src1
,
value
,
dst
,
mask
);
...
...
@@ -1806,7 +1806,7 @@ CV_IMPL void cvSubRS( const CvArr* srcarr1, CvScalar value, CvArr* dstarr, const
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
dst
=
cv
::
cvarrToMat
(
dstarr
),
mask
;
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
if
(
maskarr
)
mask
=
cv
::
cvarrToMat
(
maskarr
);
cv
::
subtract
(
value
,
src1
,
dst
,
mask
);
...
...
@@ -1817,7 +1817,7 @@ CV_IMPL void cvMul( const CvArr* srcarr1, const CvArr* srcarr2,
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
src2
=
cv
::
cvarrToMat
(
srcarr2
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
cv
::
multiply
(
src1
,
src2
,
dst
,
scale
);
}
...
...
@@ -1826,7 +1826,7 @@ CV_IMPL void cvDiv( const CvArr* srcarr1, const CvArr* srcarr2,
{
cv
::
Mat
src2
=
cv
::
cvarrToMat
(
srcarr2
),
dst
=
cv
::
cvarrToMat
(
dstarr
),
mask
;
CV_Assert
(
src2
.
size
()
==
dst
.
size
()
&&
src2
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src2
.
size
==
dst
.
size
&&
src2
.
type
()
==
dst
.
type
()
);
if
(
srcarr1
)
cv
::
divide
(
cv
::
cvarrToMat
(
srcarr1
),
src2
,
dst
,
scale
);
...
...
@@ -1842,7 +1842,7 @@ cvAddWeighted( const CvArr* srcarr1, double alpha,
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
src2
=
cv
::
cvarrToMat
(
srcarr2
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
cv
::
addWeighted
(
src1
,
alpha
,
src2
,
beta
,
gamma
,
dst
);
}
...
...
@@ -1851,7 +1851,7 @@ CV_IMPL void
cvAbsDiff
(
const
CvArr
*
srcarr1
,
const
CvArr
*
srcarr2
,
CvArr
*
dstarr
)
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
cv
::
absdiff
(
src1
,
cv
::
cvarrToMat
(
srcarr2
),
dst
);
}
...
...
@@ -1861,7 +1861,7 @@ CV_IMPL void
cvAbsDiffS
(
const
CvArr
*
srcarr1
,
CvArr
*
dstarr
,
CvScalar
scalar
)
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
cv
::
absdiff
(
src1
,
scalar
,
dst
);
}
...
...
@@ -1871,7 +1871,7 @@ cvInRange( const void* srcarr1, const void* srcarr2,
const
void
*
srcarr3
,
void
*
dstarr
)
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
dst
.
type
()
==
CV_8U
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
dst
.
type
()
==
CV_8U
);
cv
::
inRange
(
src1
,
cv
::
cvarrToMat
(
srcarr2
),
cv
::
cvarrToMat
(
srcarr3
),
dst
);
}
...
...
@@ -1880,7 +1880,7 @@ CV_IMPL void
cvInRangeS
(
const
void
*
srcarr1
,
CvScalar
lowerb
,
CvScalar
upperb
,
void
*
dstarr
)
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
dst
.
type
()
==
CV_8U
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
dst
.
type
()
==
CV_8U
);
cv
::
inRange
(
src1
,
lowerb
,
upperb
,
dst
);
}
...
...
@@ -1890,7 +1890,7 @@ CV_IMPL void
cvCmp
(
const
void
*
srcarr1
,
const
void
*
srcarr2
,
void
*
dstarr
,
int
cmp_op
)
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
dst
.
type
()
==
CV_8U
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
dst
.
type
()
==
CV_8U
);
cv
::
compare
(
src1
,
cv
::
cvarrToMat
(
srcarr2
),
dst
,
cmp_op
);
}
...
...
@@ -1900,7 +1900,7 @@ CV_IMPL void
cvCmpS
(
const
void
*
srcarr1
,
double
value
,
void
*
dstarr
,
int
cmp_op
)
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
dst
.
type
()
==
CV_8U
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
dst
.
type
()
==
CV_8U
);
cv
::
compare
(
src1
,
value
,
dst
,
cmp_op
);
}
...
...
@@ -1910,7 +1910,7 @@ CV_IMPL void
cvMin
(
const
void
*
srcarr1
,
const
void
*
srcarr2
,
void
*
dstarr
)
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
cv
::
min
(
src1
,
cv
::
cvarrToMat
(
srcarr2
),
dst
);
}
...
...
@@ -1920,7 +1920,7 @@ CV_IMPL void
cvMax
(
const
void
*
srcarr1
,
const
void
*
srcarr2
,
void
*
dstarr
)
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
cv
::
max
(
src1
,
cv
::
cvarrToMat
(
srcarr2
),
dst
);
}
...
...
@@ -1929,7 +1929,7 @@ CV_IMPL void
cvMinS
(
const
void
*
srcarr1
,
double
value
,
void
*
dstarr
)
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
cv
::
min
(
src1
,
value
,
dst
);
}
...
...
@@ -1939,7 +1939,7 @@ CV_IMPL void
cvMaxS
(
const
void
*
srcarr1
,
double
value
,
void
*
dstarr
)
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
cv
::
max
(
src1
,
value
,
dst
);
}
...
...
modules/core/src/convert.cpp
浏览文件 @
f7bebe82
...
...
@@ -970,7 +970,7 @@ cvMerge( const void* srcarr0, const void* srcarr1, const void* srcarr2,
if
(
sptrs
[
i
]
!=
0
)
{
svec
[
j
]
=
cv
::
cvarrToMat
(
sptrs
[
i
]);
CV_Assert
(
svec
[
j
].
size
()
==
dst
.
size
()
&&
CV_Assert
(
svec
[
j
].
size
==
dst
.
size
&&
svec
[
j
].
depth
()
==
dst
.
depth
()
&&
svec
[
j
].
channels
()
==
1
&&
i
<
dst
.
channels
()
);
pairs
[
j
*
2
]
=
j
;
...
...
@@ -1008,7 +1008,7 @@ cvConvertScaleAbs( const void* srcarr, void* dstarr,
double
scale
,
double
shift
)
{
cv
::
Mat
src
=
cv
::
cvarrToMat
(
srcarr
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src
.
size
()
==
dst
.
size
()
&&
dst
.
type
()
==
CV_8UC
(
src
.
channels
()));
CV_Assert
(
src
.
size
==
dst
.
size
&&
dst
.
type
()
==
CV_8UC
(
src
.
channels
()));
cv
::
convertScaleAbs
(
src
,
dst
,
scale
,
shift
);
}
...
...
@@ -1018,7 +1018,7 @@ cvConvertScale( const void* srcarr, void* 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
.
convertTo
(
dst
,
dst
.
type
(),
scale
,
shift
);
}
...
...
modules/core/src/copy.cpp
浏览文件 @
f7bebe82
...
...
@@ -522,7 +522,7 @@ cvCopy( const void* srcarr, void* dstarr, const void* maskarr )
return
;
}
cv
::
Mat
src
=
cv
::
cvarrToMat
(
srcarr
,
false
,
true
,
1
),
dst
=
cv
::
cvarrToMat
(
dstarr
,
false
,
true
,
1
);
CV_Assert
(
src
.
depth
()
==
dst
.
depth
()
&&
src
.
size
()
==
dst
.
size
()
);
CV_Assert
(
src
.
depth
()
==
dst
.
depth
()
&&
src
.
size
==
dst
.
size
);
int
coi1
=
0
,
coi2
=
0
;
if
(
CV_IS_IMAGE
(
srcarr
)
)
...
...
modules/core/src/dxt.cpp
浏览文件 @
f7bebe82
...
...
@@ -2584,7 +2584,7 @@ cvDFT( const CvArr* srcarr, CvArr* dstarr, int flags, int nonzero_rows )
((
flags
&
CV_DXT_SCALE
)
?
cv
::
DFT_SCALE
:
0
)
|
((
flags
&
CV_DXT_ROWS
)
?
cv
::
DFT_ROWS
:
0
);
CV_Assert
(
src
.
size
()
==
dst
.
size
()
);
CV_Assert
(
src
.
size
==
dst
.
size
);
if
(
src
.
type
()
!=
dst
.
type
()
)
{
...
...
@@ -2606,7 +2606,7 @@ cvMulSpectrums( const CvArr* srcAarr, const CvArr* srcBarr,
cv
::
Mat
srcA
=
cv
::
cvarrToMat
(
srcAarr
),
srcB
=
cv
::
cvarrToMat
(
srcBarr
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
srcA
.
size
()
==
dst
.
size
()
&&
srcA
.
type
()
==
dst
.
type
()
);
CV_Assert
(
srcA
.
size
==
dst
.
size
&&
srcA
.
type
()
==
dst
.
type
()
);
cv
::
mulSpectrums
(
srcA
,
srcB
,
dst
,
(
flags
&
CV_DXT_ROWS
)
?
cv
::
DFT_ROWS
:
0
,
...
...
@@ -2618,7 +2618,7 @@ CV_IMPL void
cvDCT
(
const
CvArr
*
srcarr
,
CvArr
*
dstarr
,
int
flags
)
{
cv
::
Mat
src
=
cv
::
cvarrToMat
(
srcarr
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src
.
size
()
==
dst
.
size
()
&&
src
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src
.
size
==
dst
.
size
&&
src
.
type
()
==
dst
.
type
()
);
int
_flags
=
((
flags
&
CV_DXT_INVERSE
)
?
cv
::
DCT_INVERSE
:
0
)
|
((
flags
&
CV_DXT_ROWS
)
?
cv
::
DCT_ROWS
:
0
);
cv
::
dct
(
src
,
dst
,
_flags
);
...
...
modules/core/src/mathfuncs.cpp
浏览文件 @
f7bebe82
...
...
@@ -2171,21 +2171,21 @@ cvPolarToCart( const CvArr* magarr, const CvArr* anglearr,
CV_IMPL
void
cvExp
(
const
CvArr
*
srcarr
,
CvArr
*
dstarr
)
{
cv
::
Mat
src
=
cv
::
cvarrToMat
(
srcarr
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src
.
type
()
==
dst
.
type
()
&&
src
.
size
()
==
dst
.
size
()
);
CV_Assert
(
src
.
type
()
==
dst
.
type
()
&&
src
.
size
==
dst
.
size
);
cv
::
exp
(
src
,
dst
);
}
CV_IMPL
void
cvLog
(
const
CvArr
*
srcarr
,
CvArr
*
dstarr
)
{
cv
::
Mat
src
=
cv
::
cvarrToMat
(
srcarr
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src
.
type
()
==
dst
.
type
()
&&
src
.
size
()
==
dst
.
size
()
);
CV_Assert
(
src
.
type
()
==
dst
.
type
()
&&
src
.
size
==
dst
.
size
);
cv
::
log
(
src
,
dst
);
}
CV_IMPL
void
cvPow
(
const
CvArr
*
srcarr
,
CvArr
*
dstarr
,
double
power
)
{
cv
::
Mat
src
=
cv
::
cvarrToMat
(
srcarr
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src
.
type
()
==
dst
.
type
()
&&
src
.
size
()
==
dst
.
size
()
);
CV_Assert
(
src
.
type
()
==
dst
.
type
()
&&
src
.
size
==
dst
.
size
);
cv
::
pow
(
src
,
power
,
dst
);
}
...
...
modules/core/src/matmul.cpp
浏览文件 @
f7bebe82
...
...
@@ -2878,7 +2878,7 @@ CV_IMPL void cvScaleAdd( const CvArr* srcarr1, CvScalar scale,
{
cv
::
Mat
src1
=
cv
::
cvarrToMat
(
srcarr1
),
dst
=
cv
::
cvarrToMat
(
dstarr
);
CV_Assert
(
src1
.
size
()
==
dst
.
size
()
&&
src1
.
type
()
==
dst
.
type
()
);
CV_Assert
(
src1
.
size
==
dst
.
size
&&
src1
.
type
()
==
dst
.
type
()
);
cv
::
scaleAdd
(
src1
,
scale
.
val
[
0
],
cv
::
cvarrToMat
(
srcarr2
),
dst
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录