Permalink
Browse files

Upgrade OpenCV library to 2.4.3.

Changed C++ standard library used from libstdc++ to libc++.
  • Loading branch information...
1 parent 52e86ca commit 994eba72e408f3b8bd46db31c98060842a3d39e3 @jeradesign committed Nov 30, 2012
Showing with 5,584 additions and 4,195 deletions.
  1. +10 −12 CVFunhouse.xcodeproj/project.pbxproj
  2. +1 −1 opencv2.framework/Versions/A/Headers/calib3d/calib3d.hpp
  3. +20 −16 opencv2.framework/Versions/A/Headers/contrib/contrib.hpp
  4. +6 −2 opencv2.framework/Versions/A/Headers/contrib/detection_based_tracker.hpp
  5. +405 −0 opencv2.framework/Versions/A/Headers/contrib/openfabmap.hpp
  6. +184 −184 opencv2.framework/Versions/A/Headers/contrib/retina.hpp
  7. +151 −28 opencv2.framework/Versions/A/Headers/core/core.hpp
  8. +185 −0 opencv2.framework/Versions/A/Headers/core/cuda_devptrs.hpp
  9. +43 −161 opencv2.framework/Versions/A/Headers/core/devmem2d.hpp
  10. +93 −5 opencv2.framework/Versions/A/Headers/core/eigen.hpp
  11. +577 −565 opencv2.framework/Versions/A/Headers/core/gpumat.hpp
  12. +59 −35 opencv2.framework/Versions/A/Headers/core/internal.hpp
  13. +1 −1 opencv2.framework/Versions/A/Headers/core/mat.hpp
  14. +335 −335 opencv2.framework/Versions/A/Headers/core/opengl_interop.hpp
  15. +102 −48 opencv2.framework/Versions/A/Headers/core/operations.hpp
  16. +1 −1 opencv2.framework/Versions/A/Headers/core/version.hpp
  17. +8 −8 opencv2.framework/Versions/A/Headers/core/wimage.hpp
  18. +112 −10 opencv2.framework/Versions/A/Headers/features2d/features2d.hpp
  19. +1 −0 opencv2.framework/Versions/A/Headers/flann/defines.h
  20. +41 −4 opencv2.framework/Versions/A/Headers/flann/dist.h
  21. +49 −49 opencv2.framework/Versions/A/Headers/flann/flann.hpp
  22. +2 −2 opencv2.framework/Versions/A/Headers/flann/hierarchical_clustering_index.h
  23. +12 −12 opencv2.framework/Versions/A/Headers/flann/kdtree_single_index.h
  24. +7 −5 opencv2.framework/Versions/A/Headers/flann/lsh_index.h
  25. +1 −1 opencv2.framework/Versions/A/Headers/flann/lsh_table.h
  26. +25 −19 opencv2.framework/Versions/A/Headers/flann/miniflann.hpp
  27. +163 −0 opencv2.framework/Versions/A/Headers/highgui/cap_ios.h
  28. +15 −13 opencv2.framework/Versions/A/Headers/highgui/highgui.hpp
  29. +30 −12 opencv2.framework/Versions/A/Headers/highgui/highgui_c.h
  30. +40 −1 opencv2.framework/Versions/A/Headers/imgproc/imgproc.hpp
  31. +1 −1 opencv2.framework/Versions/A/Headers/imgproc/imgproc_c.h
  32. +8 −8 opencv2.framework/Versions/A/Headers/legacy/blobtrack.hpp
  33. +11 −11 opencv2.framework/Versions/A/Headers/legacy/compat.hpp
  34. +22 −23 opencv2.framework/Versions/A/Headers/legacy/legacy.hpp
  35. +2 −2 opencv2.framework/Versions/A/Headers/legacy/streams.hpp
  36. +0 −16 opencv2.framework/Versions/A/Headers/ml/ml.hpp
  37. +20 −20 opencv2.framework/Versions/A/Headers/nonfree/features2d.hpp
  38. +1 −1 opencv2.framework/Versions/A/Headers/nonfree/nonfree.hpp
  39. +65 −37 opencv2.framework/Versions/A/Headers/objdetect/objdetect.hpp
  40. +1 −1 opencv2.framework/Versions/A/Headers/opencv_modules.hpp
  41. +18 −1 opencv2.framework/Versions/A/Headers/photo/photo.hpp
  42. +69 −69 opencv2.framework/Versions/A/Headers/photo/photo_c.h
  43. +65 −65 opencv2.framework/Versions/A/Headers/stitching/detail/autocalib.hpp
  44. +137 −137 opencv2.framework/Versions/A/Headers/stitching/detail/blenders.hpp
  45. +106 −106 opencv2.framework/Versions/A/Headers/stitching/detail/exposure_compensate.hpp
  46. +188 −188 opencv2.framework/Versions/A/Headers/stitching/detail/matchers.hpp
  47. +205 −205 opencv2.framework/Versions/A/Headers/stitching/detail/motion_estimators.hpp
  48. +259 −149 opencv2.framework/Versions/A/Headers/stitching/detail/seam_finders.hpp
  49. +162 −162 opencv2.framework/Versions/A/Headers/stitching/detail/util.hpp
  50. +127 −127 opencv2.framework/Versions/A/Headers/stitching/detail/util_inl.hpp
  51. +515 −510 opencv2.framework/Versions/A/Headers/stitching/detail/warpers.hpp
  52. +765 −764 opencv2.framework/Versions/A/Headers/stitching/detail/warpers_inl.hpp
  53. +13 −9 opencv2.framework/Versions/A/Headers/stitching/stitcher.hpp
  54. +20 −20 opencv2.framework/Versions/A/Headers/stitching/warpers.hpp
  55. +84 −17 opencv2.framework/Versions/A/Headers/video/background_segm.hpp
  56. +30 −5 opencv2.framework/Versions/A/Headers/video/tracking.hpp
  57. +11 −11 opencv2.framework/Versions/A/Resources/Info.plist
  58. BIN opencv2.framework/Versions/A/opencv2
@@ -12,11 +12,11 @@
4209534715C0BEB200C37CD8 /* CVFMotionTemplates.m in Sources */ = {isa = PBXBuildFile; fileRef = 4209534615C0BEB200C37CD8 /* CVFMotionTemplates.m */; };
420A3F8515BC6724004804EF /* CVFPassThru.m in Sources */ = {isa = PBXBuildFile; fileRef = 420A3F8415BC6724004804EF /* CVFPassThru.m */; };
42171D1215BA6C19008BEA68 /* opencv2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42171D1115BA6C19008BEA68 /* opencv2.framework */; };
- 42171D1415BA6C37008BEA68 /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 42171D1315BA6C37008BEA68 /* libstdc++.dylib */; };
423FA83715DB1AD3001D30AC /* SwitchCameraIcon44.png in Resources */ = {isa = PBXBuildFile; fileRef = 423FA83515DB1AD3001D30AC /* SwitchCameraIcon44.png */; };
423FA83815DB1AD3001D30AC /* SwitchCameraIcon44@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 423FA83615DB1AD3001D30AC /* SwitchCameraIcon44@2x.png */; };
423FA83B15DB264B001D30AC /* iButton30.png in Resources */ = {isa = PBXBuildFile; fileRef = 423FA83915DB264B001D30AC /* iButton30.png */; };
423FA83C15DB264B001D30AC /* iButton30@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 423FA83A15DB264B001D30AC /* iButton30@2x.png */; };
+ 4249F7AB16697A0900271FD5 /* libc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4249F7AA16697A0900271FD5 /* libc++.dylib */; };
4253708C1508383800BFE3C0 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4253708B1508383800BFE3C0 /* AVFoundation.framework */; };
425370901508384900BFE3C0 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4253708E1508384900BFE3C0 /* CoreMedia.framework */; };
425370911508384900BFE3C0 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4253708F1508384900BFE3C0 /* CoreVideo.framework */; };
@@ -54,11 +54,11 @@
420A3F8315BC6724004804EF /* CVFPassThru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CVFPassThru.h; path = CVFunhouse/CVFPassThru.h; sourceTree = "<group>"; };
420A3F8415BC6724004804EF /* CVFPassThru.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CVFPassThru.m; path = CVFunhouse/CVFPassThru.m; sourceTree = "<group>"; };
42171D1115BA6C19008BEA68 /* opencv2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = opencv2.framework; sourceTree = "<group>"; };
- 42171D1315BA6C37008BEA68 /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "usr/lib/libstdc++.dylib"; sourceTree = SDKROOT; };
423FA83515DB1AD3001D30AC /* SwitchCameraIcon44.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = SwitchCameraIcon44.png; sourceTree = "<group>"; };
423FA83615DB1AD3001D30AC /* SwitchCameraIcon44@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SwitchCameraIcon44@2x.png"; sourceTree = "<group>"; };
423FA83915DB264B001D30AC /* iButton30.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = iButton30.png; sourceTree = "<group>"; };
423FA83A15DB264B001D30AC /* iButton30@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iButton30@2x.png"; sourceTree = "<group>"; };
+ 4249F7AA16697A0900271FD5 /* libc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.dylib"; path = "usr/lib/libc++.dylib"; sourceTree = SDKROOT; };
4253708B1508383800BFE3C0 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
4253708E1508384900BFE3C0 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
4253708F1508384900BFE3C0 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
@@ -106,7 +106,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 42171D1415BA6C37008BEA68 /* libstdc++.dylib in Frameworks */,
+ 4249F7AB16697A0900271FD5 /* libc++.dylib in Frameworks */,
42171D1215BA6C19008BEA68 /* opencv2.framework in Frameworks */,
4275AFCC15095A2C00D74063 /* libz.dylib in Frameworks */,
42AA08581508314600B379F4 /* UIKit.framework in Frameworks */,
@@ -193,7 +193,7 @@
4253708F1508384900BFE3C0 /* CoreVideo.framework */,
42171D1115BA6C19008BEA68 /* opencv2.framework */,
4275AFCB15095A2C00D74063 /* libz.dylib */,
- 42171D1315BA6C37008BEA68 /* libstdc++.dylib */,
+ 4249F7AA16697A0900271FD5 /* libc++.dylib */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -355,6 +355,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = armv7;
+ CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+ CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
@@ -370,10 +372,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- HEADER_SEARCH_PATHS = (
- "\"$(SRCROOT)/../libraries/OpenCV-2.3.1/modules/core/include\"/**",
- "\"$(SRCROOT)/../libraries/OpenCV-2.3.1/modules/imgproc/include\"/**",
- );
+ HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -385,6 +384,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = armv7;
+ CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+ CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
@@ -393,10 +394,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- HEADER_SEARCH_PATHS = (
- "\"$(SRCROOT)/../libraries/OpenCV-2.3.1/modules/core/include\"/**",
- "\"$(SRCROOT)/../libraries/OpenCV-2.3.1/modules/imgproc/include\"/**",
- );
+ HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
SDKROOT = iphoneos;
@@ -91,7 +91,7 @@ enum
{
CV_ITERATIVE = 0,
CV_EPNP = 1, // F.Moreno-Noguer, V.Lepetit and P.Fua "EPnP: Efficient Perspective-n-Point Camera Pose Estimation"
- CV_P3P = 2 // X.S. Gao, X.-R. Hou, J. Tang, H.-F. Chang; "Complete Solution Classification for the Perspective-Three-Point Problem"
+ CV_P3P = 2 // X.S. Gao, X.-R. Hou, J. Tang, H.-F. Chang; "Complete Solution Classification for the Perspective-Three-Point Problem"
};
CVAPI(int) cvFindFundamentalMat( const CvMat* points1, const CvMat* points2,
@@ -557,15 +557,15 @@ namespace cv
void* user_data;
};
- CV_EXPORTS int chamerMatching( Mat& img, Mat& templ,
- vector<vector<Point> >& results, vector<float>& cost,
+ CV_EXPORTS_W int chamerMatching( Mat& img, Mat& templ,
+ CV_OUT vector<vector<Point> >& results, CV_OUT vector<float>& cost,
double templScale=1, int maxMatches = 20,
double minMatchDistance = 1.0, int padX = 3,
int padY = 3, int scales = 5, double minScale = 0.6, double maxScale = 1.6,
double orientationWeight = 0.5, double truncate = 20);
- class CV_EXPORTS StereoVar
+ class CV_EXPORTS_W StereoVar
{
public:
// Flags
@@ -872,7 +872,7 @@ namespace cv
// Optimization Criterion on given data in src and corresponding labels
// in labels. If 0 (or less) number of components are given, they are
// automatically determined for given data in computation.
- LDA(InputArray src, InputArray labels,
+ LDA(InputArrayOfArrays src, InputArray labels,
int num_components = 0) :
_num_components(num_components)
{
@@ -895,7 +895,7 @@ namespace cv
~LDA() {}
//! Compute the discriminants for data in src and labels.
- void compute(InputArray src, InputArray labels);
+ void compute(InputArrayOfArrays src, InputArray labels);
// Projects samples into the LDA subspace.
Mat project(InputArray src);
@@ -915,29 +915,32 @@ namespace cv
Mat _eigenvectors;
Mat _eigenvalues;
- void lda(InputArray src, InputArray labels);
+ void lda(InputArrayOfArrays src, InputArray labels);
};
- class CV_EXPORTS FaceRecognizer : public Algorithm
+ class CV_EXPORTS_W FaceRecognizer : public Algorithm
{
public:
//! virtual destructor
virtual ~FaceRecognizer() {}
// Trains a FaceRecognizer.
- virtual void train(InputArray src, InputArray labels) = 0;
+ CV_WRAP virtual void train(InputArrayOfArrays src, InputArray labels) = 0;
+
+ // Updates a FaceRecognizer.
+ CV_WRAP void update(InputArrayOfArrays src, InputArray labels);
// Gets a prediction from a FaceRecognizer.
virtual int predict(InputArray src) const = 0;
// Predicts the label and confidence for a given sample.
- virtual void predict(InputArray src, int &label, double &dist) const = 0;
+ CV_WRAP virtual void predict(InputArray src, CV_OUT int &label, CV_OUT double &confidence) const = 0;
// Serializes this object to a given filename.
- virtual void save(const string& filename) const;
+ CV_WRAP virtual void save(const string& filename) const;
// Deserializes this object from a given filename.
- virtual void load(const string& filename);
+ CV_WRAP virtual void load(const string& filename);
// Serializes this object to a given cv::FileStorage.
virtual void save(FileStorage& fs) const = 0;
@@ -947,9 +950,9 @@ namespace cv
};
- CV_EXPORTS Ptr<FaceRecognizer> createEigenFaceRecognizer(int num_components = 0, double threshold = DBL_MAX);
- CV_EXPORTS Ptr<FaceRecognizer> createFisherFaceRecognizer(int num_components = 0, double threshold = DBL_MAX);
- CV_EXPORTS Ptr<FaceRecognizer> createLBPHFaceRecognizer(int radius=1, int neighbors=8,
+ CV_EXPORTS_W Ptr<FaceRecognizer> createEigenFaceRecognizer(int num_components = 0, double threshold = DBL_MAX);
+ CV_EXPORTS_W Ptr<FaceRecognizer> createFisherFaceRecognizer(int num_components = 0, double threshold = DBL_MAX);
+ CV_EXPORTS_W Ptr<FaceRecognizer> createLBPHFaceRecognizer(int radius=1, int neighbors=8,
int grid_x=8, int grid_y=8, double threshold = DBL_MAX);
enum
@@ -968,14 +971,15 @@ namespace cv
COLORMAP_HOT = 11
};
- CV_EXPORTS void applyColorMap(InputArray src, OutputArray dst, int colormap);
+ CV_EXPORTS_W void applyColorMap(InputArray src, OutputArray dst, int colormap);
CV_EXPORTS bool initModule_contrib();
}
-
#include "opencv2/contrib/retina.hpp"
+#include "opencv2/contrib/openfabmap.hpp"
+
#endif
#endif
@@ -34,7 +34,7 @@ class DetectionBasedTracker
bool setParameters(const Parameters& params);
const Parameters& getParameters();
-
+
typedef std::pair<cv::Rect, int> Object;
virtual void getObjects(std::vector<cv::Rect>& result) const;
virtual void getObjects(std::vector<Object>& result) const;
@@ -98,5 +98,9 @@ class DetectionBasedTracker
void detectInRegion(const cv::Mat& img, const cv::Rect& r, std::vector<cv::Rect>& detectedObjectsInRegions);
};
-#endif
+namespace cv
+{
+ using ::DetectionBasedTracker;
+} //end of cv namespace
+#endif
Oops, something went wrong.

0 comments on commit 994eba7

Please sign in to comment.