Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
fd7b058b
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,发现更多精彩内容 >>
提交
fd7b058b
编写于
11月 18, 2010
作者:
V
Vadim Pisarevsky
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
DataType::generic renamed to DataType::generic_type (ticket #681)
上级
11c0c5bf
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
21 addition
and
21 deletion
+21
-21
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/core.hpp
+21
-21
未找到文件。
modules/core/include/opencv2/core/core.hpp
浏览文件 @
fd7b058b
...
...
@@ -973,7 +973,7 @@ public:
typedef
value_type
channel_type
;
typedef
value_type
vec_type
;
enum
{
generic
=
1
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
enum
{
generic
_type
=
1
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
fmt
=
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
};
...
...
@@ -985,7 +985,7 @@ public:
typedef
int
work_type
;
typedef
value_type
channel_type
;
typedef
value_type
vec_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
fmt
=
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
};
...
...
@@ -997,7 +997,7 @@ public:
typedef
int
work_type
;
typedef
value_type
channel_type
;
typedef
value_type
vec_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
fmt
=
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
};
...
...
@@ -1009,7 +1009,7 @@ public:
typedef
int
work_type
;
typedef
value_type
channel_type
;
typedef
value_type
vec_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
fmt
=
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
};
...
...
@@ -1021,7 +1021,7 @@ public:
typedef
int
work_type
;
typedef
value_type
channel_type
;
typedef
value_type
vec_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
fmt
=
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
};
...
...
@@ -1033,7 +1033,7 @@ public:
typedef
int
work_type
;
typedef
value_type
channel_type
;
typedef
value_type
vec_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
fmt
=
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
};
...
...
@@ -1045,7 +1045,7 @@ public:
typedef
int
work_type
;
typedef
value_type
channel_type
;
typedef
value_type
vec_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
fmt
=
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
};
...
...
@@ -1057,7 +1057,7 @@ public:
typedef
value_type
work_type
;
typedef
value_type
channel_type
;
typedef
value_type
vec_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
fmt
=
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
};
...
...
@@ -1069,7 +1069,7 @@ public:
typedef
value_type
work_type
;
typedef
value_type
channel_type
;
typedef
value_type
vec_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
fmt
=
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
};
...
...
@@ -1081,7 +1081,7 @@ public:
typedef
value_type
work_type
;
typedef
value_type
channel_type
;
typedef
value_type
vec_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
1
,
fmt
=
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
};
...
...
@@ -1093,7 +1093,7 @@ public:
typedef
Vec
<
typename
DataType
<
_Tp
>::
work_type
,
cn
>
work_type
;
typedef
_Tp
channel_type
;
typedef
value_type
vec_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
cn
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
cn
,
fmt
=
((
channels
-
1
)
<<
8
)
+
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
};
...
...
@@ -1104,7 +1104,7 @@ public:
typedef
std
::
complex
<
_Tp
>
value_type
;
typedef
value_type
work_type
;
typedef
_Tp
channel_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
2
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
2
,
fmt
=
((
channels
-
1
)
<<
8
)
+
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
typedef
Vec
<
channel_type
,
channels
>
vec_type
;
...
...
@@ -1116,7 +1116,7 @@ public:
typedef
Complex
<
_Tp
>
value_type
;
typedef
value_type
work_type
;
typedef
_Tp
channel_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
2
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
2
,
fmt
=
((
channels
-
1
)
<<
8
)
+
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
typedef
Vec
<
channel_type
,
channels
>
vec_type
;
...
...
@@ -1128,7 +1128,7 @@ public:
typedef
Point_
<
_Tp
>
value_type
;
typedef
Point_
<
typename
DataType
<
_Tp
>::
work_type
>
work_type
;
typedef
_Tp
channel_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
2
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
2
,
fmt
=
((
channels
-
1
)
<<
8
)
+
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
typedef
Vec
<
channel_type
,
channels
>
vec_type
;
...
...
@@ -1140,7 +1140,7 @@ public:
typedef
Point3_
<
_Tp
>
value_type
;
typedef
Point3_
<
typename
DataType
<
_Tp
>::
work_type
>
work_type
;
typedef
_Tp
channel_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
3
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
3
,
fmt
=
((
channels
-
1
)
<<
8
)
+
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
typedef
Vec
<
channel_type
,
channels
>
vec_type
;
...
...
@@ -1152,7 +1152,7 @@ public:
typedef
Size_
<
_Tp
>
value_type
;
typedef
Size_
<
typename
DataType
<
_Tp
>::
work_type
>
work_type
;
typedef
_Tp
channel_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
2
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
2
,
fmt
=
((
channels
-
1
)
<<
8
)
+
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
typedef
Vec
<
channel_type
,
channels
>
vec_type
;
...
...
@@ -1164,7 +1164,7 @@ public:
typedef
Rect_
<
_Tp
>
value_type
;
typedef
Rect_
<
typename
DataType
<
_Tp
>::
work_type
>
work_type
;
typedef
_Tp
channel_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
4
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
4
,
fmt
=
((
channels
-
1
)
<<
8
)
+
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
typedef
Vec
<
channel_type
,
channels
>
vec_type
;
...
...
@@ -1176,7 +1176,7 @@ public:
typedef
Scalar_
<
_Tp
>
value_type
;
typedef
Scalar_
<
typename
DataType
<
_Tp
>::
work_type
>
work_type
;
typedef
_Tp
channel_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
4
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
4
,
fmt
=
((
channels
-
1
)
<<
8
)
+
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
typedef
Vec
<
channel_type
,
channels
>
vec_type
;
...
...
@@ -1188,14 +1188,14 @@ public:
typedef
Range
value_type
;
typedef
value_type
work_type
;
typedef
int
channel_type
;
enum
{
generic
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
2
,
enum
{
generic
_type
=
0
,
depth
=
DataDepth
<
channel_type
>::
value
,
channels
=
2
,
fmt
=
((
channels
-
1
)
<<
8
)
+
DataDepth
<
channel_type
>::
fmt
,
type
=
CV_MAKETYPE
(
depth
,
channels
)
};
typedef
Vec
<
channel_type
,
channels
>
vec_type
;
};
////////////////////
Generic
ref-counting pointer class for C/C++ objects ////////////////////////
////////////////////
generic_type
ref-counting pointer class for C/C++ objects ////////////////////////
/*!
Smart pointer to dynamically allocated objects.
...
...
@@ -3167,7 +3167,7 @@ public:
//@{
/*!
specialized variants for 1D, 2D, 3D cases and the generic one for n-D case.
specialized variants for 1D, 2D, 3D cases and the generic
_type
one for n-D case.
return pointer to the matrix element.
<ul>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录