Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
c04725b6
O
Opencv
项目概览
Greenplum
/
Opencv
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
c04725b6
编写于
9月 05, 2012
作者:
M
marina.kolpakova
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add apply cascade method
上级
69582705
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
42 addition
and
19 deletion
+42
-19
modules/gpu/CMakeLists.txt
modules/gpu/CMakeLists.txt
+4
-4
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
+0
-1
modules/objdetect/src/softcascade.cpp
modules/objdetect/src/softcascade.cpp
+35
-11
modules/objdetect/test/test_softcascade.cpp
modules/objdetect/test/test_softcascade.cpp
+3
-3
未找到文件。
modules/gpu/CMakeLists.txt
浏览文件 @
c04725b6
...
...
@@ -15,10 +15,10 @@ file(GLOB lib_cuda_hdrs "src/cuda/*.hpp" "src/cuda/*.h")
file
(
GLOB lib_srcs
"src/*.cpp"
)
file
(
GLOB lib_cuda
"src/cuda/*.cu*"
)
source_group
(
"Include"
FILES
${
lib_hdrs
}
)
source_group
(
"Src
\\
Host"
FILES
${
lib_srcs
}
${
lib_int_hdrs
}
)
source_group
(
"Src
\\
Cuda"
FILES
${
lib_cuda
}
${
lib_cuda_hdrs
}
)
source_group
(
"Device"
FILES
${
lib_device_hdrs
}
)
source_group
(
"Include"
FILES
${
lib_hdrs
}
)
source_group
(
"Src
\\
Host"
FILES
${
lib_srcs
}
${
lib_int_hdrs
}
)
source_group
(
"Src
\\
Cuda"
FILES
${
lib_cuda
}
${
lib_cuda_hdrs
}
)
source_group
(
"Device"
FILES
${
lib_device_hdrs
}
)
source_group
(
"Device
\\
Detail"
FILES
${
lib_device_hdrs_detail
}
)
if
(
HAVE_CUDA
)
...
...
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
浏览文件 @
c04725b6
...
...
@@ -507,7 +507,6 @@ public:
int
step
=
4
,
int
rejectfactor
=
1
);
protected:
virtual
void
detectInRoi
();
virtual
void
detectForOctave
(
int
octave
);
// virtual bool detectSingleScale( const Mat& image, int stripCount, Size processingRectSize,
// int stripSize, int yStep, double factor, vector<Rect>& candidates,
...
...
modules/objdetect/src/softcascade.cpp
浏览文件 @
c04725b6
...
...
@@ -164,6 +164,15 @@ namespace {
float
relScale
()
{
return
(
factor
/
octave
);
}
};
struct
Integral
{
cv
::
Mat
magnitude
;
std
::
vector
<
cv
::
Mat
>
hist
;
cv
::
Mat
luv
;
Integral
(
cv
::
Mat
m
,
std
::
vector
<
cv
::
Mat
>
h
,
cv
::
Mat
l
)
:
magnitude
(
m
),
hist
(
h
),
luv
(
l
)
{}
};
}
struct
cv
::
SoftCascade
::
Filds
...
...
@@ -181,6 +190,26 @@ struct cv::SoftCascade::Filds
std
::
vector
<
Feature
>
features
;
std
::
vector
<
Level
>
levels
;
typedef
std
::
vector
<
Stage
>::
iterator
stIter_t
;
// carrently roi must be save for out of ranges.
void
detectInRoi
(
const
cv
::
Rect
&
roi
,
const
Integral
&
ints
,
std
::
vector
<
cv
::
Rect
>&
objects
,
const
int
step
)
{
for
(
int
dy
=
roi
.
y
;
dy
<
roi
.
height
;
dy
+=
step
)
for
(
int
dx
=
roi
.
x
;
dx
<
roi
.
width
;
dx
+=
step
)
{
applyCascade
(
ints
,
dx
,
dy
);
}
}
void
applyCascade
(
const
Integral
&
ints
,
const
int
x
,
const
int
y
)
{
for
(
stIter_t
sIt
=
sIt
.
begin
();
sIt
!=
stages
.
end
();
++
sIt
)
{
Stage
stage
&
=
*
sIt
;
}
}
// compute levels of full pyramid
void
calcLevels
(
int
frameW
,
int
frameH
,
int
scales
)
{
...
...
@@ -327,7 +356,7 @@ bool cv::SoftCascade::load( const string& filename, const float minScale, const
namespace
{
void
calcHistBins
(
const
cv
::
Mat
&
grey
,
std
::
vector
<
cv
::
Mat
>&
histInts
,
const
int
bins
)
void
calcHistBins
(
const
cv
::
Mat
&
grey
,
cv
::
Mat
magIntegral
,
std
::
vector
<
cv
::
Mat
>&
histInts
,
const
int
bins
)
{
CV_Assert
(
grey
.
type
()
==
CV_8U
);
const
int
rows
=
grey
.
rows
+
1
;
...
...
@@ -368,18 +397,10 @@ namespace {
histInts
.
push_back
(
sum
);
}
cv
::
Mat
magIntegral
;
cv
::
integral
(
mag
,
magIntegral
,
mag
.
depth
());
}
struct
Integrals
{
/* data */
};
}
void
cv
::
SoftCascade
::
detectInRoi
()
{}
void
cv
::
SoftCascade
::
detectMultiScale
(
const
Mat
&
image
,
const
std
::
vector
<
cv
::
Rect
>&
rois
,
std
::
vector
<
cv
::
Rect
>&
objects
,
...
...
@@ -405,13 +426,16 @@ void cv::SoftCascade::detectMultiScale(const Mat& image, const std::vector<cv::R
cv
::
cvtColor
(
image
,
grey
,
CV_RGB2GRAY
);
std
::
vector
<
cv
::
Mat
>
hist
;
cv
::
Mat
magnitude
;
const
int
bins
=
6
;
calcHistBins
(
grey
,
hist
,
bins
);
calcHistBins
(
grey
,
magnitude
,
hist
,
bins
);
Integral
integrals
(
magnitude
,
hist
,
luv
);
for
(
RIter_t
it
=
rois
.
begin
();
it
!=
rois
.
end
();
++
it
)
{
const
cv
::
Rect
&
roi
=
*
it
;
// detectInRoi(roi
, objects, step);
(
*
filds
).
detectInRoi
(
roi
,
integrals
,
objects
,
step
);
}
}
...
...
modules/objdetect/test/test_softcascade.cpp
浏览文件 @
c04725b6
...
...
@@ -62,8 +62,8 @@ TEST(SoftCascade, Detect)
std
::
vector
<
cv
::
Rect
>
objectBoxes
;
std
::
vector
<
cv
::
Rect
>
rois
;
rois
.
push_back
(
cv
::
Rect
(
0
,
0
,
640
,
480
));
ASSERT_NO_THROW
(
{
//
ASSERT_NO_THROW(
//
{
cascade
.
detectMultiScale
(
colored
,
rois
,
objectBoxes
);
});
//
});
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录