Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
8a3e8979
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,发现更多精彩内容 >>
提交
8a3e8979
编写于
11月 08, 2012
作者:
M
marina.kolpakova
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
min and max params become double
上级
e379771c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
10 deletion
+11
-10
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
+6
-5
modules/objdetect/src/icf.cpp
modules/objdetect/src/icf.cpp
+2
-2
modules/objdetect/src/softcascade.cpp
modules/objdetect/src/softcascade.cpp
+3
-3
未找到文件。
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
浏览文件 @
8a3e8979
...
...
@@ -523,12 +523,12 @@ public:
// Param gray is an input 1-channel gray image.
// Param integrals is a vector of integrals. Hog-channels will be appended to it.
// Param bins is a number of hog-bins
void
appendHogBins
(
const
cv
::
Mat
gray
,
std
::
vector
<
cv
::
Mat
>&
integrals
,
int
bins
)
const
;
void
appendHogBins
(
const
cv
::
Mat
&
gray
,
std
::
vector
<
cv
::
Mat
>&
integrals
,
int
bins
)
const
;
// Converts 3-channel BGR input frame in Luv and appends each channel to the integrals.
// Param frame is an input 3-channel BGR colored image.
// Param integrals is a vector of integrals. Computed from the frame luv-channels will be appended to it.
void
appendLuvBins
(
const
cv
::
Mat
frame
,
std
::
vector
<
cv
::
Mat
>&
integrals
)
const
;
void
appendLuvBins
(
const
cv
::
Mat
&
frame
,
std
::
vector
<
cv
::
Mat
>&
integrals
)
const
;
private:
int
shrinkage
;
...
...
@@ -539,7 +539,7 @@ public:
// Param minScale is a maximum scale relative to the original size of the image on which cascade will be applyed.
// Param scales is a number of scales from minScale to maxScale.
// Param rejfactor is used for NMS.
SCascade
(
const
float
minScale
=
0.4
f
,
const
float
maxScale
=
5.
f
,
const
int
scales
=
55
,
const
int
rejfactor
=
1
);
SCascade
(
const
double
minScale
=
0.4
,
const
double
maxScale
=
5.
,
const
int
scales
=
55
,
const
int
rejfactor
=
1
);
virtual
~
SCascade
();
...
...
@@ -564,8 +564,9 @@ private:
struct
Fields
;
Fields
*
fields
;
float
minScale
;
float
maxScale
;
double
minScale
;
double
maxScale
;
int
scales
;
int
rejfactor
;
};
...
...
modules/objdetect/src/icf.cpp
浏览文件 @
8a3e8979
...
...
@@ -44,7 +44,7 @@
cv
::
SCascade
::
Channels
::
Channels
(
int
shr
)
:
shrinkage
(
shr
)
{}
void
cv
::
SCascade
::
Channels
::
appendHogBins
(
const
cv
::
Mat
gray
,
std
::
vector
<
cv
::
Mat
>&
integrals
,
int
bins
)
const
void
cv
::
SCascade
::
Channels
::
appendHogBins
(
const
cv
::
Mat
&
gray
,
std
::
vector
<
cv
::
Mat
>&
integrals
,
int
bins
)
const
{
CV_Assert
(
gray
.
type
()
==
CV_8UC1
);
int
h
=
gray
.
rows
;
...
...
@@ -92,7 +92,7 @@ void cv::SCascade::Channels::appendHogBins(const cv::Mat gray, std::vector<cv::M
integrals
.
push_back
(
mag
);
}
void
cv
::
SCascade
::
Channels
::
appendLuvBins
(
const
cv
::
Mat
frame
,
std
::
vector
<
cv
::
Mat
>&
integrals
)
const
void
cv
::
SCascade
::
Channels
::
appendLuvBins
(
const
cv
::
Mat
&
frame
,
std
::
vector
<
cv
::
Mat
>&
integrals
)
const
{
CV_Assert
(
frame
.
type
()
==
CV_8UC3
);
CV_Assert
(
!
(
frame
.
cols
%
shrinkage
)
&&
!
(
frame
.
rows
%
shrinkage
));
...
...
modules/objdetect/src/softcascade.cpp
浏览文件 @
8a3e8979
...
...
@@ -296,10 +296,10 @@ struct cv::SCascade::Fields
void
calcLevels
(
const
cv
::
Size
&
curr
,
float
mins
,
float
maxs
,
int
total
)
{
if
(
frameSize
==
curr
&&
maxs
==
maxScale
&&
mins
==
minScale
&&
total
==
scales
)
return
;
CV_Assert
(
scales
>
1
);
frameSize
=
curr
;
maxScale
=
maxs
;
minScale
=
mins
;
scales
=
total
;
CV_Assert
(
scales
>
1
);
levels
.
clear
();
float
logFactor
=
(
log
(
maxScale
)
-
log
(
minScale
))
/
(
scales
-
1
);
...
...
@@ -415,7 +415,7 @@ struct cv::SCascade::Fields
}
};
cv
::
SCascade
::
SCascade
(
const
float
mins
,
const
float
maxs
,
const
int
nsc
,
const
int
rej
)
cv
::
SCascade
::
SCascade
(
const
double
mins
,
const
double
maxs
,
const
int
nsc
,
const
int
rej
)
:
fields
(
0
),
minScale
(
mins
),
maxScale
(
maxs
),
scales
(
nsc
),
rejfactor
(
rej
)
{}
cv
::
SCascade
::~
SCascade
()
{
delete
fields
;}
...
...
@@ -462,7 +462,7 @@ void cv::SCascade::detect(cv::InputArray _image, cv::InputArray _rois, std::vect
CV_Assert
(
image
.
type
()
==
CV_8UC3
);
Fields
&
fld
=
*
fields
;
fld
.
calcLevels
(
image
.
size
(),
minScale
,
maxScale
,
scales
);
fld
.
calcLevels
(
image
.
size
(),
(
float
)
minScale
,
(
float
)
maxScale
,
(
float
)
scales
);
objects
.
clear
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录