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
de4b1c66
Commit
de4b1c66
authored
Feb 03, 2014
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hopefully fixed compile warnings and the doc builder warnings
parent
30593ee5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
8 deletions
+7
-8
cascadedetect.cpp
modules/objdetect/src/cascadedetect.cpp
+4
-5
cascadedetect.hpp
modules/objdetect/src/cascadedetect.hpp
+2
-2
cascadedetect.cl
modules/objdetect/src/opencl/cascadedetect.cl
+1
-1
No files found.
modules/objdetect/src/cascadedetect.cpp
View file @
de4b1c66
...
...
@@ -464,7 +464,7 @@ bool FeatureEvaluator::setImage( InputArray _image, const std::vector<float>& _s
{
Size
imgsz
=
_image
.
size
();
bool
recalcOptFeatures
=
updateScaleData
(
imgsz
,
_scales
);
size_t
i
,
nscales
=
scaleData
->
size
();
Size
sz0
=
scaleData
->
at
(
0
).
szi
;
sz0
=
Size
(
std
::
max
(
rbuf
.
cols
,
(
int
)
alignSize
(
sz0
.
width
,
16
)),
std
::
max
(
rbuf
.
rows
,
sz0
.
height
));
...
...
@@ -802,7 +802,7 @@ void LBPEvaluator::computeOptFeatures()
optfeatures
->
resize
(
nfeatures
);
optfeaturesPtr
=
&
(
*
optfeatures
)[
0
];
for
(
fi
=
0
;
fi
<
nfeatures
;
fi
++
)
optfeaturesPtr
[
fi
].
setOffsets
(
ff
[
fi
],
sstep
);
optfeaturesPtr
[
fi
].
setOffsets
(
ff
[
fi
],
sstep
);
copyVectorToUMat
(
*
optfeatures
,
ufbuf
);
}
...
...
@@ -1098,7 +1098,7 @@ bool CascadeClassifierImpl::ocl_detectMultiScaleNoGrouping( const std::vector<fl
{
if
(
data
.
maxNodesPerTree
>
1
)
return
false
;
Ptr
<
LBPEvaluator
>
lbp
=
featureEvaluator
.
dynamicCast
<
LBPEvaluator
>
();
if
(
lbp
.
empty
()
)
return
false
;
...
...
@@ -1200,9 +1200,8 @@ void CascadeClassifierImpl::detectMultiScaleNoGrouping( InputArray _image, std::
bool
outputRejectLevels
)
{
Size
imgsz
=
_image
.
size
();
Mat
grayImage
;
UMat
ugrayImage
;
_InputArray
gray
;
candidates
.
clear
();
...
...
modules/objdetect/src/cascadedetect.hpp
View file @
de4b1c66
...
...
@@ -28,7 +28,7 @@ public:
};
virtual
~
FeatureEvaluator
();
virtual
bool
read
(
const
FileNode
&
node
,
Size
origWinSize
);
virtual
Ptr
<
FeatureEvaluator
>
clone
()
const
;
virtual
int
getFeatureType
()
const
;
...
...
@@ -211,7 +211,7 @@ protected:
Ptr
<
CvHaarClassifierCascade
>
oldCascade
;
Ptr
<
MaskGenerator
>
maskGenerator
;
UMat
ugrayImage
,
uimageBuffer
;
UMat
ugrayImage
;
UMat
ufacepos
,
ustages
,
unodes
,
uleaves
,
usubsets
;
ocl
::
Kernel
haarKernel
,
lbpKernel
;
bool
tryOpenCL
;
...
...
modules/objdetect/src/opencl/cascadedetect.cl
View file @
de4b1c66
...
...
@@ -546,7 +546,7 @@ void runLBPClassifierStump(
mask |= (CALC_SUM_OFS_( ofs.s9, ofs.sa, ofs.sd, ofs.se, p ) >= cval ? 4 : 0); // 7
mask |= (CALC_SUM_OFS_( ofs.s8, ofs.s9, ofs.sc, ofs.sd, p ) >= cval ? 2 : 0); // 6
mask |= (CALC_SUM_OFS_( ofs.s4, ofs.s5, ofs.s8, ofs.s9, p ) >= cval ? 1 : 0); // 7
s += (bitset[idx] & (1 << mask)) ? st.z : st.w;
}
...
...
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