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
3136010e
Commit
3136010e
authored
May 18, 2015
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4023 from Dikay900:cleanup_cascadedetect
parents
2fc92448
a5242265
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
5 deletions
+0
-5
cascadedetect.cpp
modules/objdetect/src/cascadedetect.cpp
+0
-4
cascadedetect.hpp
modules/objdetect/src/cascadedetect.hpp
+0
-1
No files found.
modules/objdetect/src/cascadedetect.cpp
View file @
3136010e
...
@@ -679,10 +679,6 @@ void HaarEvaluator::computeOptFeatures()
...
@@ -679,10 +679,6 @@ void HaarEvaluator::computeOptFeatures()
copyVectorToUMat
(
*
optfeatures_lbuf
,
ufbuf
);
copyVectorToUMat
(
*
optfeatures_lbuf
,
ufbuf
);
}
}
bool
HaarEvaluator
::
setImage
(
InputArray
_image
,
const
std
::
vector
<
float
>&
_scales
){
return
FeatureEvaluator
::
setImage
(
_image
,
_scales
);
}
bool
HaarEvaluator
::
setWindow
(
Point
pt
,
int
scaleIdx
)
bool
HaarEvaluator
::
setWindow
(
Point
pt
,
int
scaleIdx
)
{
{
const
ScaleData
&
s
=
getScaleData
(
scaleIdx
);
const
ScaleData
&
s
=
getScaleData
(
scaleIdx
);
...
...
modules/objdetect/src/cascadedetect.hpp
View file @
3136010e
...
@@ -347,7 +347,6 @@ public:
...
@@ -347,7 +347,6 @@ public:
virtual
Ptr
<
FeatureEvaluator
>
clone
()
const
;
virtual
Ptr
<
FeatureEvaluator
>
clone
()
const
;
virtual
int
getFeatureType
()
const
{
return
FeatureEvaluator
::
HAAR
;
}
virtual
int
getFeatureType
()
const
{
return
FeatureEvaluator
::
HAAR
;
}
virtual
bool
setImage
(
InputArray
_image
,
const
std
::
vector
<
float
>&
_scales
);
virtual
bool
setWindow
(
Point
p
,
int
scaleIdx
);
virtual
bool
setWindow
(
Point
p
,
int
scaleIdx
);
Rect
getNormRect
()
const
;
Rect
getNormRect
()
const
;
int
getSquaresOffset
()
const
;
int
getSquaresOffset
()
const
;
...
...
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