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
f080d939
Commit
f080d939
authored
7 years ago
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9578 from sovrasov:objdet_build_fix
parents
f4265d25
f2105419
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
detection_based_tracker.hpp
...ect/include/opencv2/objdetect/detection_based_tracker.hpp
+3
-1
detection_based_tracker.cpp
modules/objdetect/src/detection_based_tracker.cpp
+6
-6
No files found.
modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp
View file @
f080d939
...
...
@@ -44,9 +44,11 @@
#ifndef OPENCV_OBJDETECT_DBT_HPP
#define OPENCV_OBJDETECT_DBT_HPP
#include <opencv2/core.hpp>
// After this condition removal update blacklist for bindings: modules/python/common.cmake
#if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(__ANDROID__) || \
(defined(__cplusplus) && __cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1700
)
defined(CV_CXX11
)
#include <vector>
...
...
This diff is collapsed.
Click to expand it.
modules/objdetect/src/detection_based_tracker.cpp
View file @
f080d939
...
...
@@ -44,7 +44,7 @@
#include "precomp.hpp"
#include <cassert>
#if
(defined(__cplusplus) && __cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1700)
#if
def CV_CXX11
#define USE_STD_THREADS
#endif
...
...
@@ -56,9 +56,9 @@
#include <thread>
#include <mutex>
#include <condition_variable>
#else
#else
//USE_STD_THREADS
#include <pthread.h>
#endif
#endif
//USE_STD_THREADS
#if defined(DEBUG) || defined(_DEBUG)
#undef DEBUGLOGS
...
...
@@ -84,7 +84,7 @@
#define LOGI0(_str, ...) (printf(_str , ## __VA_ARGS__), printf("\n"), fflush(stdout))
#define LOGW0(_str, ...) (printf(_str , ## __VA_ARGS__), printf("\n"), fflush(stdout))
#define LOGE0(_str, ...) (printf(_str , ## __VA_ARGS__), printf("\n"), fflush(stdout))
#endif
#endif
//__ANDROID__
#if DEBUGLOGS
#define LOGD(_str, ...) LOGD0(_str , ## __VA_ARGS__)
...
...
@@ -96,7 +96,7 @@
#define LOGI(...)
#define LOGW(...)
#define LOGE(...)
#endif
#endif
//DEBUGLOGS
using
namespace
cv
;
...
...
@@ -1035,4 +1035,4 @@ const cv::DetectionBasedTracker::Parameters& DetectionBasedTracker::getParameter
return
parameters
;
}
#endif
#endif
//defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(__ANDROID__) || defined(USE_STD_THREADS)
This diff is collapsed.
Click to expand it.
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