Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
f0220484
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
f0220484
编写于
1月 17, 2014
作者:
R
Roman Donchenko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "fixed bug #3319"
See
092f916d
for explanation. This reverts commit
4f9c081d
.
上级
8dbc96fe
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
0 addition
and
5 deletion
+0
-5
modules/core/src/precomp.hpp
modules/core/src/precomp.hpp
+0
-5
未找到文件。
modules/core/src/precomp.hpp
浏览文件 @
f0220484
...
@@ -129,14 +129,12 @@ template<typename T> struct OpMax
...
@@ -129,14 +129,12 @@ template<typename T> struct OpMax
inline
Size
getContinuousSize
(
const
Mat
&
m1
,
int
widthScale
=
1
)
inline
Size
getContinuousSize
(
const
Mat
&
m1
,
int
widthScale
=
1
)
{
{
CV_Assert
(
m1
.
dims
<=
2
);
return
m1
.
isContinuous
()
?
Size
(
m1
.
cols
*
m1
.
rows
*
widthScale
,
1
)
:
return
m1
.
isContinuous
()
?
Size
(
m1
.
cols
*
m1
.
rows
*
widthScale
,
1
)
:
Size
(
m1
.
cols
*
widthScale
,
m1
.
rows
);
Size
(
m1
.
cols
*
widthScale
,
m1
.
rows
);
}
}
inline
Size
getContinuousSize
(
const
Mat
&
m1
,
const
Mat
&
m2
,
int
widthScale
=
1
)
inline
Size
getContinuousSize
(
const
Mat
&
m1
,
const
Mat
&
m2
,
int
widthScale
=
1
)
{
{
CV_Assert
(
m1
.
dims
<=
2
&&
m1
.
size
()
==
m2
.
size
());
return
(
m1
.
flags
&
m2
.
flags
&
Mat
::
CONTINUOUS_FLAG
)
!=
0
?
return
(
m1
.
flags
&
m2
.
flags
&
Mat
::
CONTINUOUS_FLAG
)
!=
0
?
Size
(
m1
.
cols
*
m1
.
rows
*
widthScale
,
1
)
:
Size
(
m1
.
cols
*
widthScale
,
m1
.
rows
);
Size
(
m1
.
cols
*
m1
.
rows
*
widthScale
,
1
)
:
Size
(
m1
.
cols
*
widthScale
,
m1
.
rows
);
}
}
...
@@ -144,7 +142,6 @@ inline Size getContinuousSize( const Mat& m1, const Mat& m2, int widthScale=1 )
...
@@ -144,7 +142,6 @@ inline Size getContinuousSize( const Mat& m1, const Mat& m2, int widthScale=1 )
inline
Size
getContinuousSize
(
const
Mat
&
m1
,
const
Mat
&
m2
,
inline
Size
getContinuousSize
(
const
Mat
&
m1
,
const
Mat
&
m2
,
const
Mat
&
m3
,
int
widthScale
=
1
)
const
Mat
&
m3
,
int
widthScale
=
1
)
{
{
CV_Assert
(
m1
.
dims
<=
2
&&
m1
.
size
()
==
m2
.
size
()
&&
m1
.
size
()
==
m3
.
size
());
return
(
m1
.
flags
&
m2
.
flags
&
m3
.
flags
&
Mat
::
CONTINUOUS_FLAG
)
!=
0
?
return
(
m1
.
flags
&
m2
.
flags
&
m3
.
flags
&
Mat
::
CONTINUOUS_FLAG
)
!=
0
?
Size
(
m1
.
cols
*
m1
.
rows
*
widthScale
,
1
)
:
Size
(
m1
.
cols
*
widthScale
,
m1
.
rows
);
Size
(
m1
.
cols
*
m1
.
rows
*
widthScale
,
1
)
:
Size
(
m1
.
cols
*
widthScale
,
m1
.
rows
);
}
}
...
@@ -153,7 +150,6 @@ inline Size getContinuousSize( const Mat& m1, const Mat& m2,
...
@@ -153,7 +150,6 @@ inline Size getContinuousSize( const Mat& m1, const Mat& m2,
const
Mat
&
m3
,
const
Mat
&
m4
,
const
Mat
&
m3
,
const
Mat
&
m4
,
int
widthScale
=
1
)
int
widthScale
=
1
)
{
{
CV_Assert
(
m1
.
dims
<=
2
&&
m1
.
size
()
==
m2
.
size
()
&&
m1
.
size
()
==
m3
.
size
()
&&
m1
.
size
()
==
m4
.
size
());
return
(
m1
.
flags
&
m2
.
flags
&
m3
.
flags
&
m4
.
flags
&
Mat
::
CONTINUOUS_FLAG
)
!=
0
?
return
(
m1
.
flags
&
m2
.
flags
&
m3
.
flags
&
m4
.
flags
&
Mat
::
CONTINUOUS_FLAG
)
!=
0
?
Size
(
m1
.
cols
*
m1
.
rows
*
widthScale
,
1
)
:
Size
(
m1
.
cols
*
widthScale
,
m1
.
rows
);
Size
(
m1
.
cols
*
m1
.
rows
*
widthScale
,
1
)
:
Size
(
m1
.
cols
*
widthScale
,
m1
.
rows
);
}
}
...
@@ -162,7 +158,6 @@ inline Size getContinuousSize( const Mat& m1, const Mat& m2,
...
@@ -162,7 +158,6 @@ inline Size getContinuousSize( const Mat& m1, const Mat& m2,
const
Mat
&
m3
,
const
Mat
&
m4
,
const
Mat
&
m3
,
const
Mat
&
m4
,
const
Mat
&
m5
,
int
widthScale
=
1
)
const
Mat
&
m5
,
int
widthScale
=
1
)
{
{
CV_Assert
(
m1
.
dims
<=
2
&&
m1
.
size
()
==
m2
.
size
()
&&
m1
.
size
()
==
m3
.
size
()
&&
m1
.
size
()
==
m4
.
size
()
&&
m1
.
size
()
==
m5
.
size
());
return
(
m1
.
flags
&
m2
.
flags
&
m3
.
flags
&
m4
.
flags
&
m5
.
flags
&
Mat
::
CONTINUOUS_FLAG
)
!=
0
?
return
(
m1
.
flags
&
m2
.
flags
&
m3
.
flags
&
m4
.
flags
&
m5
.
flags
&
Mat
::
CONTINUOUS_FLAG
)
!=
0
?
Size
(
m1
.
cols
*
m1
.
rows
*
widthScale
,
1
)
:
Size
(
m1
.
cols
*
widthScale
,
m1
.
rows
);
Size
(
m1
.
cols
*
m1
.
rows
*
widthScale
,
1
)
:
Size
(
m1
.
cols
*
widthScale
,
m1
.
rows
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录