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

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Alekhin
2021-06-04 11:51:43 +00:00
parent b754406352 3e513ee6ab
commit b91e0dca90
253 changed files with 13923 additions and 3300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/misc/objc/common/Point2i.h
-1
View File
@@ -21,7 +21,6 @@ NS_ASSUME_NONNULL_BEGIN
/**
* Represents a two dimensional point the coordinate values of which are of type `int`
*/
NS_SWIFT_NAME(Point)
CV_EXPORTS @interface Point2i : NSObject
# pragma mark - Properties
modules/core/misc/objc/common/Rect2i.h
-1
View File
@@ -22,7 +22,6 @@ NS_ASSUME_NONNULL_BEGIN
/**
* Represents a rectange the coordinate and dimension values of which are of type `int`
*/
NS_SWIFT_NAME(Rect)
CV_EXPORTS @interface Rect2i : NSObject
#pragma mark - Properties
modules/core/misc/objc/common/Size2i.h
-1
View File
@@ -21,7 +21,6 @@ NS_ASSUME_NONNULL_BEGIN
/**
* Represents the dimensions of a rectangle the values of which are of type `int`
*/
NS_SWIFT_NAME(Size)
CV_EXPORTS @interface Size2i : NSObject
#pragma mark - Properties
modules/core/misc/objc/common/Typealiases.swift
+11
View File
@@ -0,0 +1,11 @@
//
// Typealiases.swift
//
// Created by Chris Ballinger on 2020/11/18.
//
import Foundation
public typealias Rect = Rect2i
public typealias Point = Point2i
public typealias Size = Size2i
modules/core/misc/objc/gen_dict.json
+9 -9
View File
@@ -113,13 +113,13 @@
"objc_type": "Point2i*",
"to_cpp": "%(n)s.nativeRef",
"from_cpp": "[Point2i fromNative:%(n)s]",
"swift_type": "Point"
"swift_type": "Point2i"
},
"Point2i": {
"objc_type": "Point2i*",
"to_cpp": "%(n)s.nativeRef",
"from_cpp": "[Point2i fromNative:%(n)s]",
"swift_type": "Point"
"swift_type": "Point2i"
},
"Point2f": {
"objc_type": "Point2f*",
@@ -155,13 +155,13 @@
"objc_type": "Rect2i*",
"to_cpp": "%(n)s.nativeRef",
"from_cpp": "[Rect2i fromNative:%(n)s]",
"swift_type": "Rect"
"swift_type": "Rect2i"
},
"Rect2i": {
"objc_type": "Rect2i*",
"to_cpp": "%(n)s.nativeRef",
"from_cpp": "[Rect2i fromNative:%(n)s]",
"swift_type": "Rect"
"swift_type": "Rect2i"
},
"Rect2f": {
"objc_type": "Rect2f*",
@@ -187,13 +187,13 @@
"objc_type": "Size2i*",
"to_cpp": "%(n)s.nativeRef",
"from_cpp": "[Size2i fromNative:%(n)s]",
"swift_type": "Size"
"swift_type": "Size2i"
},
"Size2i": {
"objc_type": "Size2i*",
"to_cpp": "%(n)s.nativeRef",
"from_cpp": "[Size2i fromNative:%(n)s]",
"swift_type": "Size"
"swift_type": "Size2i"
},
"Size2f": {
"objc_type": "Size2f*",
@@ -275,7 +275,7 @@
"vector_Point": {
"objc_type": "Point2i*",
"v_type": "Point2i",
"swift_type": "[Point]"
"swift_type": "[Point2i]"
},
"vector_Point2f": {
"objc_type": "Point2f*",
@@ -300,7 +300,7 @@
"vector_Rect": {
"objc_type": "Rect2i*",
"v_type": "Rect2i",
"swift_type": "[Rect]"
"swift_type": "[Rect2i]"
},
"vector_Rect2d": {
"objc_type": "Rect2d*",
@@ -388,7 +388,7 @@
"vector_vector_Point": {
"objc_type": "Point2i*",
"v_v_type": "Point2i",
"swift_type": "[[Point]]"
"swift_type": "[[Point2i]]"
},
"vector_vector_Point2f": {
"objc_type": "Point2f*",