potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #7370 from souch55:Fixxn

Browse Source
This commit is contained in:
Alexander Alekhin
2016-10-01 10:44:55 +00:00
parent 16b4ccb846 a34fbf7bb1
commit 1c18b1d245
273 changed files with 657 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/objdetect/include/opencv2/objdetect.hpp
+2 -2
View File
@@ -41,8 +41,8 @@
//
//M*/
#ifndef __OPENCV_OBJDETECT_HPP__
#define __OPENCV_OBJDETECT_HPP__
#ifndef OPENCV_OBJDETECT_HPP
#define OPENCV_OBJDETECT_HPP
#include "opencv2/core.hpp"
modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp
+2 -2
View File
@@ -41,8 +41,8 @@
//
//M*/
#ifndef __OPENCV_OBJDETECT_DBT_HPP__
#define __OPENCV_OBJDETECT_DBT_HPP__
#ifndef OPENCV_OBJDETECT_DBT_HPP
#define OPENCV_OBJDETECT_DBT_HPP
// After this condition removal update blacklist for bindings: modules/python/common.cmake
#if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(__ANDROID__) || \
modules/objdetect/include/opencv2/objdetect/objdetect_c.h
+3 -3
View File
@@ -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"
@@ -162,4 +162,4 @@ CV_EXPORTS CvSeq* cvHaarDetectObjectsForROC( const CvArr* image,
#endif
#endif /* __OPENCV_OBJDETECT_C_H__ */
#endif /* OPENCV_OBJDETECT_C_H */