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

Merge remote-tracking branch 'upstream/master' into merge-4.x

Browse Source
This commit is contained in:
Alexander Alekhin
2020-11-27 18:14:53 +00:00
parent 3268cc46ba 7521f207b1
commit 9d2eabaaa2
457 changed files with 30205 additions and 4172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/misc/objc/common/Converters.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import <opencv2/opencv.hpp>
#import <opencv2/core.hpp>
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/CvType.h
+1 -1
View File
@@ -5,7 +5,7 @@
//
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/DMatch.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Double2.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Double3.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Float4.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Float6.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Int4.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/KeyPoint.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Mat.h
+2 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
@@ -97,6 +97,7 @@ CV_EXPORTS @interface Mat : NSObject
- (void)createEx:(NSArray<NSNumber*>*)sizes type:(int)type NS_SWIFT_NAME(create(sizes:type:));
- (void)copySize:(Mat*)mat;
- (Mat*)cross:(Mat*)mat;
- (unsigned char*)dataPtr NS_SWIFT_NAME(dataPointer());
- (int)depth;
- (Mat*)diag:(int)diagonal;
- (Mat*)diag;
modules/core/misc/objc/common/Mat.mm
+4
View File
@@ -286,6 +286,10 @@ static bool updateIdx(cv::Mat* mat, std::vector<int>& indices, int inc) {
return [[Mat alloc] initWithNativeMat:new cv::Mat(_nativePtr->cross(*(cv::Mat*)mat.nativePtr))];
}
- (unsigned char*)dataPtr {
return _nativePtr->data;
}
- (int)depth {
return _nativePtr->depth();
}
modules/core/misc/objc/common/MinMaxLocResult.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Point2d.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Point2f.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Point2i.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Point3d.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Point3f.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Point3i.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Range.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Rect2d.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Rect2f.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Rect2i.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/RotatedRect.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Scalar.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Size2d.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Size2f.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/Size2i.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/common/TermCriteria.h
+1 -1
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef __cplusplus
#import "opencv.hpp"
#import "opencv2/core.hpp"
#else
#define CV_EXPORTS
#endif
modules/core/misc/objc/gen_dict.json
+7
View File
@@ -217,6 +217,13 @@
"from_cpp": "[NSString stringWithUTF8String:%(n)s.c_str()]",
"swift_type": "String"
},
"string": {
"cast_to": "std::string",
"objc_type": "NSString*",
"to_cpp": "std::string(%(n)s.UTF8String)",
"from_cpp": "[NSString stringWithUTF8String:%(n)s.c_str()]",
"swift_type": "String"
},
"TermCriteria": {
"objc_type": "TermCriteria*",
"to_cpp": "%(n)s.nativeRef",