mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 22:44:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

objdetect: fix wrong cxx11 features check

Browse Source
This commit is contained in:
Vladislav Sovrasov 2017-09-07 12:25:36 +03:00
parent 2ac57a2b1f
commit f2105419fa
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp
View File

@ -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>

12
modules/objdetect/src/detection_based_tracker.cpp
View File

@ -44,7 +44,7 @@
#include "precomp.hpp"
#include <cassert>
#if (defined(__cplusplus) && __cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1700)
#ifdef 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)