Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
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_contrib
Commits
5eb03d2e
Commit
5eb03d2e
authored
Nov 04, 2015
by
Yan Wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add macro definition to avoid building error.
Signed-off-by:
Yan Wang
<
yan.wang@linux.intel.com
>
parent
06b03a7b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
multiTracker.cpp
modules/tracking/src/multiTracker.cpp
+9
-0
multiTracker.hpp
modules/tracking/src/multiTracker.hpp
+3
-0
No files found.
modules/tracking/src/multiTracker.cpp
View file @
5eb03d2e
...
...
@@ -119,9 +119,11 @@ namespace cv
//Detect all
for
(
int
k
=
0
;
k
<
targetNum
;
k
++
)
tmpCandidates
[
k
]
=
boundingBoxes
[
k
];
#ifdef HAVE_OPENCL
if
(
ocl
::
haveOpenCL
())
ocl_detect_all
(
imageForDetector
,
image_blurred
,
tmpCandidates
,
detectorResults
,
detect_flgs
,
trackers
);
else
#endif
detect_all
(
imageForDetector
,
image_blurred
,
tmpCandidates
,
detectorResults
,
detect_flgs
,
trackers
);
for
(
int
k
=
0
;
k
<
targetNum
;
k
++
)
...
...
@@ -215,16 +217,20 @@ namespace cv
}
tldModel
->
integrateRelabeled
(
imageForDetector
,
image_blurred
,
detectorResults
[
k
]);
pExpert
.
additionalExamples
(
examplesForModel
,
examplesForEnsemble
);
#ifdef HAVE_OPENCL
if
(
ocl
::
haveOpenCL
())
tldModel
->
ocl_integrateAdditional
(
examplesForModel
,
examplesForEnsemble
,
true
);
else
#endif
tldModel
->
integrateAdditional
(
examplesForModel
,
examplesForEnsemble
,
true
);
examplesForModel
.
clear
();
examplesForEnsemble
.
clear
();
nExpert
.
additionalExamples
(
examplesForModel
,
examplesForEnsemble
);
#ifdef HAVE_OPENCL
if
(
ocl
::
haveOpenCL
())
tldModel
->
ocl_integrateAdditional
(
examplesForModel
,
examplesForEnsemble
,
false
);
else
#endif
tldModel
->
integrateAdditional
(
examplesForModel
,
examplesForEnsemble
,
false
);
}
else
...
...
@@ -434,6 +440,7 @@ namespace cv
}
}
#ifdef HAVE_OPENCL
void
ocl_detect_all
(
const
Mat
&
img
,
const
Mat
&
imgBlurred
,
std
::
vector
<
Rect2d
>&
res
,
std
::
vector
<
std
::
vector
<
tld
::
TLDDetector
::
LabeledPatch
>
>
&
patches
,
std
::
vector
<
bool
>
&
detect_flgs
,
std
::
vector
<
Ptr
<
Tracker
>
>
&
trackers
)
{
...
...
@@ -644,5 +651,6 @@ namespace cv
}
}
}
#endif
}
\ No newline at end of file
modules/tracking/src/multiTracker.hpp
View file @
5eb03d2e
...
...
@@ -51,7 +51,9 @@ namespace cv
{
void
detect_all
(
const
Mat
&
img
,
const
Mat
&
imgBlurred
,
std
::
vector
<
Rect2d
>&
res
,
std
::
vector
<
std
::
vector
<
tld
::
TLDDetector
::
LabeledPatch
>
>
&
patches
,
std
::
vector
<
bool
>&
detect_flgs
,
std
::
vector
<
Ptr
<
Tracker
>
>&
trackers
);
#ifdef HAVE_OPENCL
void
ocl_detect_all
(
const
Mat
&
img
,
const
Mat
&
imgBlurred
,
std
::
vector
<
Rect2d
>&
res
,
std
::
vector
<
std
::
vector
<
tld
::
TLDDetector
::
LabeledPatch
>
>
&
patches
,
std
::
vector
<
bool
>&
detect_flgs
,
std
::
vector
<
Ptr
<
Tracker
>
>&
trackers
);
#endif
}
#endif
\ No newline at end of file
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