commit x64 compilation from lulu cause the other branch dont seems to compile properly at home
This commit is contained in:
@ -41,11 +41,14 @@
|
||||
//
|
||||
//M*/
|
||||
|
||||
#ifndef __OPENCV_OBJDETECT_DBT_HPP__
|
||||
#define __OPENCV_OBJDETECT_DBT_HPP__
|
||||
#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 > 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700)
|
||||
defined(CV_CXX11)
|
||||
|
||||
#include <vector>
|
||||
|
||||
@ -58,7 +61,7 @@ namespace cv
|
||||
class CV_EXPORTS DetectionBasedTracker
|
||||
{
|
||||
public:
|
||||
struct Parameters
|
||||
struct CV_EXPORTS Parameters
|
||||
{
|
||||
int maxTrackLifetime;
|
||||
int minDetectionPeriod; //the minimal time between run of the big object detector (on the whole frame) in ms (1000 mean 1 sec), default=0
|
||||
|
||||
@ -41,8 +41,8 @@
|
||||
//
|
||||
//M*/
|
||||
|
||||
#ifndef __OPENCV_OBJDETECT_C_H__
|
||||
#define __OPENCV_OBJDETECT_C_H__
|
||||
#ifndef OPENCV_OBJDETECT_C_H
|
||||
#define OPENCV_OBJDETECT_C_H
|
||||
|
||||
#include "opencv2/core/core_c.h"
|
||||
|
||||
@ -69,6 +69,7 @@ extern "C" {
|
||||
(((const CvHaarClassifierCascade*)(haar))->flags & CV_MAGIC_MASK)==CV_HAAR_MAGIC_VAL)
|
||||
|
||||
#define CV_HAAR_FEATURE_MAX 3
|
||||
#define CV_HAAR_STAGE_MAX 1000
|
||||
|
||||
typedef struct CvHaarFeature
|
||||
{
|
||||
@ -162,4 +163,4 @@ CV_EXPORTS CvSeq* cvHaarDetectObjectsForROC( const CvArr* image,
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* __OPENCV_OBJDETECT_C_H__ */
|
||||
#endif /* OPENCV_OBJDETECT_C_H */
|
||||
|
||||
Reference in New Issue
Block a user