Upgrade to OpenCV 3.2.0

OSX support has been temporarilly removed
elliotwoods · Mar 14, 2017 · cff4a7e · cff4a7e
1 parent 8794c79
commit cff4a7e
Show file tree

Hide file tree

Showing 437 changed files with 80,382 additions and 74,546 deletions.
diff --git a/Test_Build/Test_Build.sln b/Test_Build/Test_Build.sln
@@ -1,12 +1,12 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.22823.1
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test_Build", "Test_Build.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofxCvMin", "..\..\..\addons\ofxCvMin\ofxCvMinLib\ofxCvMinLib.vcxproj", "{4D3BCFDD-E65D-4247-B303-E0839CAEC6A6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofxCvMinLib", "..\ofxCvMinLib\ofxCvMinLib.vcxproj", "{4D3BCFDD-E65D-4247-B303-E0839CAEC6A6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,16 +22,16 @@ Global
 		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64
 		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
 		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
-		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|Win32
-		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
-		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|Win32
-		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64
 		{4D3BCFDD-E65D-4247-B303-E0839CAEC6A6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4D3BCFDD-E65D-4247-B303-E0839CAEC6A6}.Debug|Win32.Build.0 = Debug|Win32
 		{4D3BCFDD-E65D-4247-B303-E0839CAEC6A6}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/Test_Build/src/ofApp.cpp b/Test_Build/src/ofApp.cpp
@@ -1,5 +1,7 @@
 #include "ofApp.h"
 
+#include <opencv2/aruco.hpp>
+
 using namespace ofxCv;
 using namespace cv;
 
@@ -19,6 +21,8 @@ void ofApp::update(){
 	ofxCv::imitate(this->preview, matImage);
 	ofxCv::copy(matImage, this->preview, 3);
 	this->preview.update();
+
+	auto dictionary = cv::aruco::getPredefinedDictionary(cv::aruco::DICT_6X6_250);
 }
 
 //--------------------------------------------------------------

diff --git a/libs/opencv/include/opencv/cv.h b/libs/opencv/include/opencv/cv.h
@@ -40,8 +40,8 @@
 //
 //M*/
 
-#ifndef __OPENCV_OLD_CV_H__
-#define __OPENCV_OLD_CV_H__
+#ifndef OPENCV_OLD_CV_H
+#define OPENCV_OLD_CV_H
 
 #if defined(_MSC_VER)
     #define CV_DO_PRAGMA(x) __pragma(x)
@@ -61,22 +61,13 @@
 //CV_WARNING("This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module")
 
 #include "opencv2/core/core_c.h"
-#include "opencv2/core/core.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/video/tracking.hpp"
-#include "opencv2/features2d/features2d.hpp"
-#include "opencv2/flann/flann.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
-#include "opencv2/legacy/compat.hpp"
+#include "opencv2/photo/photo_c.h"
+#include "opencv2/video/tracking_c.h"
+#include "opencv2/objdetect/objdetect_c.h"
 
 #if !defined(CV_IMPL)
 #define CV_IMPL extern "C"
 #endif //CV_IMPL
 
-#if defined(__cplusplus)
-#include "opencv2/core/internal.hpp"
-#endif //__cplusplus
-
 #endif // __OPENCV_OLD_CV_H_
diff --git a/libs/opencv/include/opencv/cv.hpp b/libs/opencv/include/opencv/cv.hpp
@@ -40,13 +40,21 @@
 //
 //M*/
 
-#ifndef __OPENCV_OLD_CV_HPP__
-#define __OPENCV_OLD_CV_HPP__
+#ifndef OPENCV_OLD_CV_HPP
+#define OPENCV_OLD_CV_HPP
 
 //#if defined(__GNUC__)
 //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
 //#endif
 
-#include <cv.h>
+#include "cv.h"
+#include "opencv2/core.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/photo.hpp"
+#include "opencv2/video.hpp"
+#include "opencv2/highgui.hpp"
+#include "opencv2/features2d.hpp"
+#include "opencv2/calib3d.hpp"
+#include "opencv2/objdetect.hpp"
 
 #endif
diff --git a/libs/opencv/include/opencv/cvaux.h b/libs/opencv/include/opencv/cvaux.h
@@ -39,26 +39,18 @@
 //
 //M*/
 
-#ifndef __OPENCV_OLD_AUX_H__
-#define __OPENCV_OLD_AUX_H__
+#ifndef OPENCV_OLD_AUX_H
+#define OPENCV_OLD_AUX_H
 
 //#if defined(__GNUC__)
 //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
 //#endif
 
 #include "opencv2/core/core_c.h"
-#include "opencv2/core/core.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/video/tracking.hpp"
-#include "opencv2/video/background_segm.hpp"
-#include "opencv2/features2d/features2d.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
-#include "opencv2/legacy/legacy.hpp"
-#include "opencv2/legacy/compat.hpp"
-#include "opencv2/legacy/blobtrack.hpp"
-#include "opencv2/contrib/contrib.hpp"
+#include "opencv2/photo/photo_c.h"
+#include "opencv2/video/tracking_c.h"
+#include "opencv2/objdetect/objdetect_c.h"
 
 #endif
 

diff --git a/libs/opencv/include/opencv/cvaux.hpp b/libs/opencv/include/opencv/cvaux.hpp
@@ -39,13 +39,14 @@
 //
 //M*/
 
-#ifndef __OPENCV_OLD_AUX_HPP__
-#define __OPENCV_OLD_AUX_HPP__
+#ifndef OPENCV_OLD_AUX_HPP
+#define OPENCV_OLD_AUX_HPP
 
 //#if defined(__GNUC__)
 //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
 //#endif
 
-#include <cvaux.h>
+#include "cvaux.h"
+#include "opencv2/core/utility.hpp"
 
 #endif
diff --git a/libs/opencv/include/opencv/cvwimage.h b/libs/opencv/include/opencv/cvwimage.h
@@ -38,8 +38,8 @@
 // the use of this software, even if advised of the possibility of such damage.
 
 
-#ifndef __OPENCV_OLD_WIMAGE_HPP__
-#define __OPENCV_OLD_WIMAGE_HPP__
+#ifndef OPENCV_OLD_WIMAGE_HPP
+#define OPENCV_OLD_WIMAGE_HPP
 
 #include "opencv2/core/wimage.hpp"
 

diff --git a/libs/opencv/include/opencv/cxcore.h b/libs/opencv/include/opencv/cxcore.h
@@ -40,14 +40,13 @@
 //
 //M*/
 
-#ifndef __OPENCV_OLD_CXCORE_H__
-#define __OPENCV_OLD_CXCORE_H__
+#ifndef OPENCV_OLD_CXCORE_H
+#define OPENCV_OLD_CXCORE_H
 
 //#if defined(__GNUC__)
 //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
 //#endif
 
 #include "opencv2/core/core_c.h"
-#include "opencv2/core/core.hpp"
 
 #endif
diff --git a/libs/opencv/include/opencv/cxcore.hpp b/libs/opencv/include/opencv/cxcore.hpp
@@ -40,13 +40,14 @@
 //
 //M*/
 
-#ifndef __OPENCV_OLD_CXCORE_HPP__
-#define __OPENCV_OLD_CXCORE_HPP__
+#ifndef OPENCV_OLD_CXCORE_HPP
+#define OPENCV_OLD_CXCORE_HPP
 
 //#if defined(__GNUC__)
 //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
 //#endif
 
-#include <cxcore.h>
+#include "cxcore.h"
+#include "opencv2/core.hpp"
 
 #endif
diff --git a/libs/opencv/include/opencv/cxeigen.hpp b/libs/opencv/include/opencv/cxeigen.hpp
@@ -40,8 +40,8 @@
 //
 //M*/
 
-#ifndef __OPENCV_OLD_EIGEN_HPP__
-#define __OPENCV_OLD_EIGEN_HPP__
+#ifndef OPENCV_OLD_EIGEN_HPP
+#define OPENCV_OLD_EIGEN_HPP
 
 #include "opencv2/core/eigen.hpp"
 

diff --git a/libs/opencv/include/opencv/cxmisc.h b/libs/opencv/include/opencv/cxmisc.h
@@ -1,6 +1,8 @@
-#ifndef __OPENCV_OLD_CXMISC_H__
-#define __OPENCV_OLD_CXMISC_H__
+#ifndef OPENCV_OLD_CXMISC_H
+#define OPENCV_OLD_CXMISC_H
 
-#include "opencv2/core/internal.hpp"
+#ifdef __cplusplus
+#  include "opencv2/core/utility.hpp"
+#endif
 
 #endif
diff --git a/libs/opencv/include/opencv/highgui.h b/libs/opencv/include/opencv/highgui.h
@@ -39,12 +39,10 @@
 //
 //M*/
 
-#ifndef __OPENCV_OLD_HIGHGUI_H__
-#define __OPENCV_OLD_HIGHGUI_H__
+#ifndef OPENCV_OLD_HIGHGUI_H
+#define OPENCV_OLD_HIGHGUI_H
 
 #include "opencv2/core/core_c.h"
-#include "opencv2/core/core.hpp"
 #include "opencv2/highgui/highgui_c.h"
-#include "opencv2/highgui/highgui.hpp"
 
 #endif
diff --git a/libs/opencv/include/opencv/ml.h b/libs/opencv/include/opencv/ml.h
@@ -38,11 +38,10 @@
 //
 //M*/
 
-#ifndef __OPENCV_OLD_ML_H__
-#define __OPENCV_OLD_ML_H__
+#ifndef OPENCV_OLD_ML_H
+#define OPENCV_OLD_ML_H
 
 #include "opencv2/core/core_c.h"
-#include "opencv2/core/core.hpp"
-#include "opencv2/ml/ml.hpp"
+#include "opencv2/ml.hpp"
 
 #endif