Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
9cc80a68
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,发现更多精彩内容 >>
提交
9cc80a68
编写于
4月 14, 2014
作者:
I
Ilya Lavrenov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed warnings
上级
76c415ff
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
50 addition
and
5 deletion
+50
-5
modules/calib3d/src/stereosgbm.cpp
modules/calib3d/src/stereosgbm.cpp
+2
-3
modules/core/perf/opencl/perf_matop.cpp
modules/core/perf/opencl/perf_matop.cpp
+43
-0
modules/core/src/arithm.cpp
modules/core/src/arithm.cpp
+2
-1
modules/imgproc/src/accum.cpp
modules/imgproc/src/accum.cpp
+2
-0
modules/imgproc/src/corner.cpp
modules/imgproc/src/corner.cpp
+1
-1
未找到文件。
modules/calib3d/src/stereosgbm.cpp
浏览文件 @
9cc80a68
...
...
@@ -1078,7 +1078,7 @@ void cv::filterSpeckles( InputOutputArray _img, double _newval, int maxSpeckleSi
double
_maxDiff
,
InputOutputArray
__buf
)
{
Mat
img
=
_img
.
getMat
();
int
type
=
img
.
type
()
,
cn
=
CV_MAT_CN
(
type
)
;
int
type
=
img
.
type
();
Mat
temp
,
&
_buf
=
__buf
.
needed
()
?
__buf
.
getMatRef
()
:
temp
;
CV_Assert
(
type
==
CV_8UC1
||
type
==
CV_16SC1
);
...
...
@@ -1089,7 +1089,7 @@ void cv::filterSpeckles( InputOutputArray _img, double _newval, int maxSpeckleSi
IppiSize
roisize
=
{
img
.
cols
,
img
.
rows
};
IppDataType
datatype
=
type
==
CV_8UC1
?
ipp8u
:
ipp16s
;
if
(
!
__buf
.
needed
()
&&
ippiMarkSpecklesGetBufferSize
(
roisize
,
datatype
,
cn
,
&
bufsize
))
if
(
!
__buf
.
needed
()
&&
ippiMarkSpecklesGetBufferSize
(
roisize
,
datatype
,
CV_MAT_CN
(
type
)
,
&
bufsize
))
{
Ipp8u
*
buffer
=
ippsMalloc_8u
(
bufsize
);
IppStatus
status
=
(
IppStatus
)
-
1
;
...
...
@@ -1101,7 +1101,6 @@ void cv::filterSpeckles( InputOutputArray _img, double _newval, int maxSpeckleSi
status
=
ippiMarkSpeckles_16s_C1IR
((
Ipp16s
*
)
img
.
data
,
(
int
)
img
.
step
,
roisize
,
(
Ipp16s
)
newVal
,
maxSpeckleSize
,
maxDiff
,
ippiNormL1
,
buffer
);
printf
(
"%s
\n
"
,
ippGetStatusString
(
status
));
if
(
status
>=
0
)
return
;
}
...
...
modules/core/perf/opencl/perf_matop.cpp
浏览文件 @
9cc80a68
...
...
@@ -35,6 +35,28 @@ OCL_PERF_TEST_P(SetToFixture, SetTo,
SANITY_CHECK
(
src
);
}
///////////// SetTo with mask ////////////////////////
typedef
Size_MatType
SetToFixture
;
OCL_PERF_TEST_P
(
SetToFixture
,
SetToWithMask
,
::
testing
::
Combine
(
OCL_TEST_SIZES
,
OCL_TEST_TYPES
))
{
const
Size_MatType_t
params
=
GetParam
();
const
Size
srcSize
=
get
<
0
>
(
params
);
const
int
type
=
get
<
1
>
(
params
);
const
Scalar
s
=
Scalar
::
all
(
17
);
checkDeviceMaxMemoryAllocSize
(
srcSize
,
type
);
UMat
src
(
srcSize
,
type
),
mask
(
srcSize
,
CV_8UC1
);
declare
.
in
(
src
,
mask
,
WARMUP_RNG
).
out
(
src
);
OCL_TEST_CYCLE
()
src
.
setTo
(
s
,
mask
);
SANITY_CHECK
(
src
);
}
///////////// ConvertTo ////////////////////////
typedef
Size_MatType
ConvertToFixture
;
...
...
@@ -79,6 +101,27 @@ OCL_PERF_TEST_P(CopyToFixture, CopyTo,
SANITY_CHECK
(
dst
);
}
///////////// CopyTo with mask ////////////////////////
typedef
Size_MatType
CopyToFixture
;
OCL_PERF_TEST_P
(
CopyToFixture
,
CopyToWithMask
,
::
testing
::
Combine
(
OCL_TEST_SIZES
,
OCL_TEST_TYPES
))
{
const
Size_MatType_t
params
=
GetParam
();
const
Size
srcSize
=
get
<
0
>
(
params
);
const
int
type
=
get
<
1
>
(
params
);
checkDeviceMaxMemoryAllocSize
(
srcSize
,
type
);
UMat
src
(
srcSize
,
type
),
dst
(
srcSize
,
type
),
mask
(
srcSize
,
CV_8UC1
);
declare
.
in
(
src
,
mask
,
WARMUP_RNG
).
out
(
dst
);
OCL_TEST_CYCLE
()
src
.
copyTo
(
dst
,
mask
);
SANITY_CHECK
(
dst
);
}
}
}
// namespace cvtest::ocl
#endif // HAVE_OPENCL
modules/core/src/arithm.cpp
浏览文件 @
9cc80a68
...
...
@@ -2011,7 +2011,8 @@ recip_( const T*, size_t, const T* src2, size_t step2,
static
void
mul8u
(
const
uchar
*
src1
,
size_t
step1
,
const
uchar
*
src2
,
size_t
step2
,
uchar
*
dst
,
size_t
step
,
Size
sz
,
void
*
scale
)
{
mul_
(
src1
,
step1
,
src2
,
step2
,
dst
,
step
,
sz
,
(
float
)
*
(
const
double
*
)
scale
);
float
fscale
=
(
float
)
*
(
const
double
*
)
scale
;
mul_
(
src1
,
step1
,
src2
,
step2
,
dst
,
step
,
sz
,
fscale
);
}
static
void
mul8s
(
const
schar
*
src1
,
size_t
step1
,
const
schar
*
src2
,
size_t
step2
,
...
...
modules/imgproc/src/accum.cpp
浏览文件 @
9cc80a68
...
...
@@ -442,9 +442,11 @@ void cv::accumulate( InputArray _src, InputOutputArray _dst, InputArray _mask )
if
(
mask
.
empty
())
{
CV_SUPPRESS_DEPRECATED_START
ippFunc
=
sdepth
==
CV_8U
&&
ddepth
==
CV_32F
?
(
ippiAdd
)
ippiAdd_8u32f_C1IR
:
sdepth
==
CV_16U
&&
ddepth
==
CV_32F
?
(
ippiAdd
)
ippiAdd_16u32f_C1IR
:
sdepth
==
CV_32F
&&
ddepth
==
CV_32F
?
(
ippiAdd
)
ippiAdd_32f_C1IR
:
0
;
CV_SUPPRESS_DEPRECATED_END
}
else
if
(
scn
==
1
)
{
...
...
modules/imgproc/src/corner.cpp
浏览文件 @
9cc80a68
...
...
@@ -473,7 +473,7 @@ void cv::cornerHarris( InputArray _src, OutputArray _dst, int blockSize, int ksi
_dst
.
create
(
src
.
size
(),
CV_32FC1
);
Mat
dst
=
_dst
.
getMat
();
#if
defined HAVE_IPP
&& !defined HAVE_IPP_ICV_ONLY
#if
IPP_VERSION_X100 >= 801
&& !defined HAVE_IPP_ICV_ONLY
int
type
=
src
.
type
(),
depth
=
CV_MAT_DEPTH
(
type
),
cn
=
CV_MAT_CN
(
type
);
int
borderTypeNI
=
borderType
&
~
BORDER_ISOLATED
;
bool
isolated
=
(
borderType
&
BORDER_ISOLATED
)
!=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录