Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
46568721
Commit
46568721
authored
Nov 06, 2012
by
marina.kolpakova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed typo
parent
5fb9f483
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
objdetect.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
+2
-2
softcascade.cpp
modules/objdetect/src/softcascade.cpp
+8
-8
No files found.
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
View file @
46568721
...
...
@@ -561,8 +561,8 @@ public:
private
:
void
detectNoRoi
(
const
Mat
&
image
,
std
::
vector
<
Detection
>&
objects
)
const
;
struct
Filds
;
Fi
lds
*
fi
lds
;
struct
Fi
e
lds
;
Fi
elds
*
fie
lds
;
float
minScale
;
float
maxScale
;
...
...
modules/objdetect/src/softcascade.cpp
View file @
46568721
...
...
@@ -253,7 +253,7 @@ struct ChannelStorage
}
struct
cv
::
SCascade
::
Filds
struct
cv
::
SCascade
::
Fi
e
lds
{
float
minScale
;
float
maxScale
;
...
...
@@ -493,9 +493,9 @@ struct cv::SCascade::Filds
};
cv
::
SCascade
::
SCascade
(
const
float
mins
,
const
float
maxs
,
const
int
nsc
,
const
int
rej
)
:
filds
(
0
),
minScale
(
mins
),
maxScale
(
maxs
),
scales
(
nsc
),
rejfactor
(
rej
)
{}
:
fi
e
lds
(
0
),
minScale
(
mins
),
maxScale
(
maxs
),
scales
(
nsc
),
rejfactor
(
rej
)
{}
cv
::
SCascade
::~
SCascade
()
{
delete
filds
;}
cv
::
SCascade
::~
SCascade
()
{
delete
fi
e
lds
;}
void
cv
::
SCascade
::
read
(
const
FileNode
&
fn
)
{
...
...
@@ -504,15 +504,15 @@ void cv::SCascade::read(const FileNode& fn)
bool
cv
::
SCascade
::
load
(
const
FileNode
&
fn
)
{
if
(
fi
lds
)
delete
fi
lds
;
if
(
fi
elds
)
delete
fie
lds
;
fi
lds
=
new
Fi
lds
;
return
filds
->
fill
(
fn
,
minScale
,
maxScale
);
fi
elds
=
new
Fie
lds
;
return
fi
e
lds
->
fill
(
fn
,
minScale
,
maxScale
);
}
void
cv
::
SCascade
::
detectNoRoi
(
const
cv
::
Mat
&
image
,
std
::
vector
<
Detection
>&
objects
)
const
{
Fi
lds
&
fld
=
*
fi
lds
;
Fi
elds
&
fld
=
*
fie
lds
;
// create integrals
ChannelStorage
storage
(
image
,
fld
.
shrinkage
);
...
...
@@ -538,7 +538,7 @@ void cv::SCascade::detect(cv::InputArray _image, cv::InputArray _rois, std::vect
cv
::
Mat
image
=
_image
.
getMat
();
CV_Assert
(
image
.
type
()
==
CV_8UC3
);
Fi
lds
&
fld
=
*
fi
lds
;
Fi
elds
&
fld
=
*
fie
lds
;
fld
.
calcLevels
(
image
.
size
(),
scales
);
objects
.
clear
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment