Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
e02195b3
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,发现更多精彩内容 >>
提交
e02195b3
编写于
6月 24, 2015
作者:
P
Pavel Vlasov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Accidentally removed tegra checks were returned;
上级
e5760983
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
25 deletion
+16
-25
modules/imgproc/src/color.cpp
modules/imgproc/src/color.cpp
+16
-25
未找到文件。
modules/imgproc/src/color.cpp
浏览文件 @
e02195b3
...
...
@@ -7323,17 +7323,13 @@ static bool ocl_cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
#endif
}
//namespace cv
#ifdef HAVE_IPP
namespace
cv
{
static
bool
ipp_cvtColor
(
InputArray
_src
,
OutputArray
_dst
,
int
code
,
int
dcn
)
static
bool
ipp_cvtColor
(
Mat
&
src
,
OutputArray
_dst
,
int
code
,
int
dcn
)
{
int
stype
=
_
src
.
type
();
int
stype
=
src
.
type
();
int
scn
=
CV_MAT_CN
(
stype
),
depth
=
CV_MAT_DEPTH
(
stype
);
Mat
src
=
_src
.
getMat
(),
dst
;
Mat
dst
;
Size
sz
=
src
.
size
();
switch
(
code
)
...
...
@@ -7916,8 +7912,8 @@ static bool ipp_cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
return
false
;
}
}
}
#endif
}
//////////////////////////////////////////////////////////////////////////////////////////
// The main function //
...
...
@@ -7933,8 +7929,9 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
Mat
src
=
_src
.
getMat
(),
dst
;
Size
sz
=
src
.
size
();
CV_Assert
(
depth
==
CV_8U
||
depth
==
CV_16U
||
depth
==
CV_32F
);
CV_IPP_RUN
(
true
,
ipp_cvtColor
(
_
src
,
_dst
,
code
,
dcn
));
CV_IPP_RUN
(
true
,
ipp_cvtColor
(
src
,
_dst
,
code
,
dcn
));
switch
(
code
)
{
...
...
@@ -7947,13 +7944,13 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
_dst
.
create
(
sz
,
CV_MAKETYPE
(
depth
,
dcn
));
dst
=
_dst
.
getMat
();
if
(
depth
==
CV_8U
)
{
#ifdef HAVE_TEGRA_OPTIMIZATION
if
(
!
tegra
::
cvtBGR2RGB
(
src
,
dst
,
bidx
))
if
(
tegra
::
useTegra
()
&&
tegra
::
cvtBGR2RGB
(
src
,
dst
,
bidx
))
break
;
#endif
CvtColorLoop
(
src
,
dst
,
RGB2RGB
<
uchar
>
(
scn
,
dcn
,
bidx
));
CvtColorLoop
(
src
,
dst
,
RGB2RGB
<
uchar
>
(
scn
,
dcn
,
bidx
));
}
else
if
(
depth
==
CV_16U
)
CvtColorLoop
(
src
,
dst
,
RGB2RGB
<
ushort
>
(
scn
,
dcn
,
bidx
));
...
...
@@ -7967,10 +7964,9 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
_dst
.
create
(
sz
,
CV_8UC2
);
dst
=
_dst
.
getMat
();
#ifdef HAVE_TEGRA_OPTIMIZATION
if
(
code
==
CV_BGR2BGR565
||
code
==
CV_BGRA2BGR565
||
code
==
CV_RGB2BGR565
||
code
==
CV_RGBA2BGR565
)
if
(
tegra
::
cvtRGB2RGB565
(
src
,
dst
,
code
==
CV_RGB2BGR565
||
code
==
CV_RGBA2BGR565
?
0
:
2
))
if
(
tegra
::
useTegra
()
&&
tegra
::
cvtRGB2RGB565
(
src
,
dst
,
code
==
CV_RGB2BGR565
||
code
==
CV_RGBA2BGR565
?
0
:
2
))
break
;
#endif
...
...
@@ -8002,13 +7998,13 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
_dst
.
create
(
sz
,
CV_MAKETYPE
(
depth
,
1
));
dst
=
_dst
.
getMat
();
bidx
=
code
==
CV_BGR2GRAY
||
code
==
CV_BGRA2GRAY
?
0
:
2
;
if
(
depth
==
CV_8U
)
{
#ifdef HAVE_TEGRA_OPTIMIZATION
if
(
!
tegra
::
cvtRGB2Gray
(
src
,
dst
,
bidx
))
if
(
tegra
::
useTegra
()
&&
tegra
::
cvtRGB2Gray
(
src
,
dst
,
bidx
))
break
;
#endif
CvtColorLoop
(
src
,
dst
,
RGB2Gray
<
uchar
>
(
scn
,
bidx
,
0
));
}
...
...
@@ -8032,11 +8028,11 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
_dst
.
create
(
sz
,
CV_MAKETYPE
(
depth
,
dcn
));
dst
=
_dst
.
getMat
();
if
(
depth
==
CV_8U
)
{
#ifdef HAVE_TEGRA_OPTIMIZATION
if
(
!
tegra
::
cvtGray2RGB
(
src
,
dst
))
if
(
tegra
::
useTegra
()
&&
tegra
::
cvtGray2RGB
(
src
,
dst
))
break
;
#endif
CvtColorLoop
(
src
,
dst
,
Gray2RGB
<
uchar
>
(
dcn
));
}
...
...
@@ -8070,7 +8066,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
if
(
depth
==
CV_8U
)
{
#ifdef HAVE_TEGRA_OPTIMIZATION
if
((
code
==
CV_RGB2YCrCb
||
code
==
CV_BGR2YCrCb
)
&&
tegra
::
cvtRGB2YCrCb
(
src
,
dst
,
bidx
))
if
((
code
==
CV_RGB2YCrCb
||
code
==
CV_BGR2YCrCb
)
&&
tegra
::
useTegra
()
&&
tegra
::
cvtRGB2YCrCb
(
src
,
dst
,
bidx
))
break
;
#endif
CvtColorLoop
(
src
,
dst
,
RGB2YCrCb_i
<
uchar
>
(
scn
,
bidx
,
coeffs_i
));
...
...
@@ -8096,7 +8092,6 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
_dst
.
create
(
sz
,
CV_MAKETYPE
(
depth
,
dcn
));
dst
=
_dst
.
getMat
();
if
(
depth
==
CV_8U
)
CvtColorLoop
(
src
,
dst
,
YCrCb2RGB_i
<
uchar
>
(
dcn
,
bidx
,
coeffs_i
));
else
if
(
depth
==
CV_16U
)
...
...
@@ -8149,12 +8144,11 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
_dst
.
create
(
sz
,
CV_MAKETYPE
(
depth
,
3
));
dst
=
_dst
.
getMat
();
if
(
code
==
CV_BGR2HSV
||
code
==
CV_RGB2HSV
||
code
==
CV_BGR2HSV_FULL
||
code
==
CV_RGB2HSV_FULL
)
{
#ifdef HAVE_TEGRA_OPTIMIZATION
if
(
tegra
::
cvtRGB2HSV
(
src
,
dst
,
bidx
,
hrange
))
if
(
tegra
::
useTegra
()
&&
tegra
::
cvtRGB2HSV
(
src
,
dst
,
bidx
,
hrange
))
break
;
#endif
if
(
depth
==
CV_8U
)
...
...
@@ -8185,7 +8179,6 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
_dst
.
create
(
sz
,
CV_MAKETYPE
(
depth
,
dcn
));
dst
=
_dst
.
getMat
();
if
(
code
==
CV_HSV2BGR
||
code
==
CV_HSV2RGB
||
code
==
CV_HSV2BGR_FULL
||
code
==
CV_HSV2RGB_FULL
)
{
...
...
@@ -8216,7 +8209,6 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
_dst
.
create
(
sz
,
CV_MAKETYPE
(
depth
,
3
));
dst
=
_dst
.
getMat
();
if
(
code
==
CV_BGR2Lab
||
code
==
CV_RGB2Lab
||
code
==
CV_LBGR2Lab
||
code
==
CV_LRGB2Lab
)
{
...
...
@@ -8248,7 +8240,6 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
_dst
.
create
(
sz
,
CV_MAKETYPE
(
depth
,
dcn
));
dst
=
_dst
.
getMat
();
if
(
code
==
CV_Lab2BGR
||
code
==
CV_Lab2RGB
||
code
==
CV_Lab2LBGR
||
code
==
CV_Lab2LRGB
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录