Jun 8, 2020 · Dec 14, 2019 · Jan 19, 2020 · Jan 27, 2020 · Feb 1, 2020 · Feb 10, 2020
diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
  if (APPLE)
    file(GLOB_RECURSE lib_srcs_apple
         "${CMAKE_CURRENT_LIST_DIR}/src/*.mm"
         "${CMAKE_CURRENT_LIST_DIR}/src/*.swift"
    )
    list(APPEND lib_srcs ${lib_srcs_apple})
  endif()
diff --git a/modules/core/misc/objc/src/ByteVector.mm b/modules/core/misc/objc/src/ByteVector.mm
 }

 -(SInt8)get:(NSInteger)index {
    if (index < 0 || index >= v.size()) {
    if (index < 0 || index >=(long)v.size()) {
        @throw [NSException exceptionWithName:NSRangeException reason:@"Invalid data length" userInfo:nil];
    }
    return v[index];
diff --git a/modules/core/misc/objc/src/CVObjcUtil.h b/modules/core/misc/objc/src/CVObjcUtil.h

 template <typename CV, typename OBJC> void cv2objc(std::vector<CV>& vector, NSMutableArray<OBJC*>* _Nonnull array, OBJC* _Nonnull (* _Nonnull converter)(CV&)) {
    [array removeAllObjects];
    for (int index = 0; index < vector.size(); index++) {
    for (size_t index = 0; index < vector.size(); index++) {
        [array addObject:converter(vector[index])];
    }
 }

 template <typename CV, typename OBJC> void cv2objc2(std::vector<std::vector<CV>>& vector, NSMutableArray<NSMutableArray<OBJC*>*>* _Nonnull array, OBJC* _Nonnull (* _Nonnull converter)(CV&)) {
    [array removeAllObjects];
    for (int index = 0; index < vector.size(); index++) {
    for (size_t index = 0; index < vector.size(); index++) {
        std::vector<CV>& innerVector = vector[index];
        NSMutableArray<OBJC*>* innerArray = [NSMutableArray arrayWithCapacity:innerVector.size()];
        for (int index2 = 0; index2 < innerVector.size(); index2++) {
        for (size_t index2 = 0; index2 < innerVector.size(); index2++) {
            [innerArray addObject:converter(innerVector[index2])];
        }
        [array addObject:innerArray];
diff --git a/modules/core/misc/objc/src/DoubleVector.mm b/modules/core/misc/objc/src/DoubleVector.mm
 }

 -(double)get:(NSInteger)index {
    if (index < 0 || index >= v.size()) {
    if (index < 0 || index >=(long)v.size()) {
        @throw [NSException exceptionWithName:NSRangeException reason:@"Invalid data length" userInfo:nil];
    }
    return v[index];
diff --git a/modules/core/misc/objc/src/Float4.h b/modules/core/misc/objc/src/Float4.h

 #import <Foundation/Foundation.h>

 NS_ASSUME_NONNULL_BEGIN

 @class Mat;

 @interface Float4 : NSObject
 -(BOOL)isEqual:(nullable id)other;

 @end

 NS_ASSUME_NONNULL_END
diff --git a/modules/core/misc/objc/src/Float6.h b/modules/core/misc/objc/src/Float6.h

 @class Mat;

 NS_ASSUME_NONNULL_BEGIN

 @interface Float6 : NSObject

 @property float v0;
 -(BOOL)isEqual:(nullable id)other;

 @end

 NS_ASSUME_NONNULL_END
diff --git a/modules/core/misc/objc/src/FloatVector.mm b/modules/core/misc/objc/src/FloatVector.mm
 }

 -(float)get:(NSInteger)index {
    if (index < 0 || index >= v.size()) {
    if (index < 0 || index >=(long)v.size()) {
        @throw [NSException exceptionWithName:NSRangeException reason:@"Invalid data length" userInfo:nil];
    }
    return v[index];
diff --git a/modules/core/misc/objc/src/Int4.h b/modules/core/misc/objc/src/Int4.h

 @class Mat;

 NS_ASSUME_NONNULL_BEGIN

 @interface Int4 : NSObject

 @property int v0;
 -(BOOL)isEqual:(nullable id)other;

 @end

 NS_ASSUME_NONNULL_END
diff --git a/modules/core/misc/objc/src/IntOut.h b/modules/core/misc/objc/src/IntOut.h

 #import <Foundation/Foundation.h>

 NS_ASSUME_NONNULL_BEGIN

 @interface IntOut : NSObject

 @property(readonly) int val;

 -(int*)ptr;

 @end

 NS_ASSUME_NONNULL_END
diff --git a/modules/core/misc/objc/src/IntVector.mm b/modules/core/misc/objc/src/IntVector.mm
 }

 -(int)get:(NSInteger)index {
    if (index < 0 || index >= v.size()) {
    if (index < 0 || index >=(long)v.size()) {
        @throw [NSException exceptionWithName:NSRangeException reason:@"Invalid data length" userInfo:nil];
    }
    return v[index];
diff --git a/modules/core/misc/objc/src/KeyPoint.h b/modules/core/misc/objc/src/KeyPoint.h
 //
 //Range.h
 //KeyPoint.h
 //
 //  Created by Giles Payne on 2019/10/08.
 //  Copyright © 2019 Xtravision. All rights reserved.

 #import <Foundation/Foundation.h>

 @classCVPoint;
 @classPoint2f;

 NS_ASSUME_NONNULL_BEGIN

 @interface KeyPoint : NSObject

 @property CVPoint* pt;
 @property(assign) Point2f* pt;
 @property float size;
 @property float angle;
 @property float response;
diff --git a/modules/core/misc/objc/src/Mat.mm b/modules/core/misc/objc/src/Mat.mm
 //

 #import "Mat.h"
 #import "CVSize.h"
 #import "Size2i.h"
 #import "Scalar.h"
 #import "Range.h"
 #import "CVRect.h"
 #import "CVPoint.h"
 #import "Rect2i.h"
 #import "Point2i.h"
 #import "CvType.h"
 #import "CVObjcUtil.h"

    return self;
 }

 - (instancetype)initWithSize:(CVSize*)size type:(int)type {
 - (instancetype)initWithSize:(Size2i*)size type:(int)type {
    self = [super init];
    if (self) {
        _nativePtr = new cv::Mat(size.width, size.height, type);
    return self;
 }

 - (instancetype)initWithSize:(CVSize*)size type:(int)type scalar:(Scalar *)scalar {
 - (instancetype)initWithSize:(Size2i*)size type:(int)type scalar:(Scalar *)scalar {
    self = [super init];
    if (self) {
        cv::Scalar scalerTemp(scalar.val[0].doubleValue, scalar.val[1].doubleValue, scalar.val[2].doubleValue, scalar.val[3].doubleValue);
    return self;
 }

 - (instancetype)initWithMat:(Mat*)mat rect:(CVRect*)roi {
 - (instancetype)initWithMat:(Mat*)mat rect:(Rect2i*)roi {
    self = [super init];
    if (self) {
        cv::Range rows(roi.y, roi.y + roi.height);
    _nativePtr->create(rows, cols, type);
 }

 - (void)create:(CVSize*)size type:(int)type {
 - (void)create:(Size2i*)size type:(int)type {
    cv::Size tempSize(size.width, size.height);
    _nativePtr->create(tempSize, type);
 }
    return [[Mat alloc] initWithNativeMat:new cv::Mat(cv::Mat::eye(rows, cols, type))];
 }

 + (Mat*)eye:(CVSize*)size type:(int)type {
 + (Mat*)eye:(Size2i*)size type:(int)type {
    cv::Size tempSize(size.width, size.height);
    return [[Mat alloc] initWithNativeMat:new cv::Mat(cv::Mat::eye(tempSize, type))];
 }
    return _nativePtr->isSubmatrix();
 }

 - (void)locateROI:(CVSize*)wholeSize ofs:(CVPoint*)ofs {
 - (void)locateROI:(Size2i*)wholeSize ofs:(Point2i*)ofs {
    cv::Size tempWholeSize;
    cv::Point tempOfs;
    _nativePtr->locateROI(tempWholeSize, tempOfs);
    return [[Mat alloc] initWithNativeMat:new cv::Mat(cv::Mat::ones(rows, cols, type))];
 }

 + (Mat*)ones:(CVSize*)size type:(int)type {
 + (Mat*)ones:(Size2i*)size type:(int)type {
    cv::Size tempSize(size.width, size.height);
    return [[Mat alloc] initWithNativeMat:new cv::Mat(cv::Mat::ones(tempSize, type))];
 }
    return [[Mat alloc] initWithNativeMat:new cv::Mat(_nativePtr->setTo(*(cv::Mat*)value.nativePtr))];
 }

 - (CVSize*)size {
    return [[CVSize alloc] initWithWidth:_nativePtr->size().width height:_nativePtr->size().height];
 - (Size2i*)size {
    return [[Size2i alloc] initWithWidth:_nativePtr->size().width height:_nativePtr->size().height];
 }

 - (int)size:(int)dimIndex {
    return [[Mat alloc] initWithNativeMat:new cv::Mat(_nativePtr->operator()(tempRanges))];
 }

 - (Mat*)submatRoi:(CVRect*)roi {
 - (Mat*)submatRoi:(Rect2i*)roi {
    cv::Rect tempRoi(roi.x, roi.y, roi.width, roi.height);
    return [[Mat alloc] initWithNativeMat:new cv::Mat(_nativePtr->operator()(tempRoi))];
 }
    return [[Mat alloc] initWithNativeMat:new cv::Mat(cv::Mat::zeros(rows, cols, type))];
 }

 + (Mat*)zeros:(CVSize*)size type:(int)type {
 + (Mat*)zeros:(Size2i*)size type:(int)type {
    cv::Size tempSize(size.width, size.height);
    return [[Mat alloc] initWithNativeMat:new cv::Mat(cv::Mat::zeros(tempSize, type))];
 }
diff --git a/modules/core/misc/objc/src/MatOfDMatch.mm b/modules/core/misc/objc/src/MatOfDMatch.mm

 - (void)fromArray:(NSArray<DMatch*>*)array {
    NSMutableArray<NSNumber*>* data = [[NSMutableArray alloc] initWithCapacity:array.count * _channels];
    for (int index = 0; index < array.count; index++) {
    for (int index = 0; index <(int)array.count; index++) {
        data[_channels * index] = [NSNumber numberWithFloat:array[index].queryIdx];
        data[_channels * index + 1] = [NSNumber numberWithFloat:array[index].trainIdx];
        data[_channels * index + 2] = [NSNumber numberWithFloat:array[index].imgIdx];
diff --git a/modules/core/misc/objc/src/MatOfKeyPoint.mm b/modules/core/misc/objc/src/MatOfKeyPoint.mm

 - (void)fromArray:(NSArray<KeyPoint*>*)array {
    NSMutableArray<NSNumber*>* data = [[NSMutableArray alloc] initWithCapacity:array.count * _channels];
    for (int index = 0; index < array.count; index++) {
    for (int index = 0; index <(int)array.count; index++) {
        data[_channels * index] = [NSNumber numberWithFloat:array[index].pt.x];
        data[_channels * index + 1] = [NSNumber numberWithFloat:array[index].pt.y];
        data[_channels * index + 2] = [NSNumber numberWithFloat:array[index].size];
diff --git a/modules/core/misc/objc/src/MatOfPoint.mm b/modules/core/misc/objc/src/MatOfPoint.mm

 - (void)fromArray:(NSArray<Point2i*>*)array {
    NSMutableArray<NSNumber*>* data = [[NSMutableArray alloc] initWithCapacity:array.count * _channels];
    for (int index = 0; index < array.count; index++) {
    for (int index = 0; index <(int)array.count; index++) {
        data[_channels * index] = [NSNumber numberWithInt:array[index].x];
        data[_channels * index + 1] = [NSNumber numberWithInt:array[index].y];
    }
diff --git a/modules/core/misc/objc/src/MatOfPoint2f.mm b/modules/core/misc/objc/src/MatOfPoint2f.mm

 - (void)fromArray:(NSArray<Point2f*>*)array {
    NSMutableArray<NSNumber*>* data = [[NSMutableArray alloc] initWithCapacity:array.count * _channels];
    for (int index = 0; index < array.count; index++) {
    for (int index = 0; index <(int)array.count; index++) {
        data[_channels * index] = [NSNumber numberWithFloat:array[index].x];
        data[_channels * index + 1] = [NSNumber numberWithFloat:array[index].y];
    }
diff --git a/modules/core/misc/objc/src/MatOfPoint3.mm b/modules/core/misc/objc/src/MatOfPoint3.mm

 - (void)fromArray:(NSArray<Point3i*>*)array {
    NSMutableArray<NSNumber*>* data = [[NSMutableArray alloc] initWithCapacity:array.count * _channels];
    for (int index = 0; index < array.count; index++) {
    for (int index = 0; index <(int)array.count; index++) {
        data[_channels * index] = [NSNumber numberWithInt:array[index].x];
        data[_channels * index + 1] = [NSNumber numberWithInt:array[index].y];
        data[_channels * index + 2] = [NSNumber numberWithInt:array[index].z];
diff --git a/modules/core/misc/objc/src/MatOfPoint3f.mm b/modules/core/misc/objc/src/MatOfPoint3f.mm

 - (void)fromArray:(NSArray<Point3f*>*)array {
    NSMutableArray<NSNumber*>* data = [[NSMutableArray alloc] initWithCapacity:array.count * _channels];
    for (int index = 0; index < array.count; index++) {
    for (int index = 0; index <(int)array.count; index++) {
        data[_channels * index] = [NSNumber numberWithFloat:array[index].x];
        data[_channels * index + 1] = [NSNumber numberWithFloat:array[index].y];
        data[_channels * index + 2] = [NSNumber numberWithFloat:array[index].z];
diff --git a/modules/core/misc/objc/src/MatOfRect.mm b/modules/core/misc/objc/src/MatOfRect.mm

 - (void)fromArray:(NSArray<Rect2i*>*)array {
    NSMutableArray<NSNumber*>* data = [[NSMutableArray alloc] initWithCapacity:array.count * _channels];
    for (int index = 0; index < array.count; index++) {
    for (int index = 0; index <(int)array.count; index++) {
        data[_channels * index] = [NSNumber numberWithInt:array[index].x];
        data[_channels * index + 1] = [NSNumber numberWithInt:array[index].y];
        data[_channels * index + 2] = [NSNumber numberWithInt:array[index].width];
diff --git a/modules/core/misc/objc/src/MatOfRect2d.mm b/modules/core/misc/objc/src/MatOfRect2d.mm

 - (void)fromArray:(NSArray<Rect2d*>*)array {
    NSMutableArray<NSNumber*>* data = [[NSMutableArray alloc] initWithCapacity:array.count * _channels];
    for (int index = 0; index < array.count; index++) {
    for (int index = 0; index <(int)array.count; index++) {
        data[_channels * index] = [NSNumber numberWithDouble:array[index].x];
        data[_channels * index + 1] = [NSNumber numberWithDouble:array[index].y];
        data[_channels * index + 2] = [NSNumber numberWithDouble:array[index].width];
diff --git a/modules/core/misc/objc/src/MatOfRotatedRect.mm b/modules/core/misc/objc/src/MatOfRotatedRect.mm

 - (void)fromArray:(NSArray<RotatedRect*>*)array {
    NSMutableArray<NSNumber*>* data = [[NSMutableArray alloc] initWithCapacity:array.count * _channels];
    for (int index = 0; index < array.count; index++) {
    for (int index = 0; index <(int)array.count; index++) {
        data[_channels * index] = [NSNumber numberWithFloat:array[index].center.x];
        data[_channels * index + 1] = [NSNumber numberWithFloat:array[index].center.y];
        data[_channels * index + 2] = [NSNumber numberWithFloat:array[index].size.width];
diff --git a/modules/core/misc/objc/src/MinMaxLocResult.h b/modules/core/misc/objc/src/MinMaxLocResult.h

 @property double minVal;
 @property double maxVal;
 @property Point2i* minLoc;
 @property Point2i* maxLoc;
 @property(assign) Point2i* minLoc;
 @property(assign) Point2i* maxLoc;

 - (instancetype)init;
 - (instancetype)initWithMinval:(double)minVal maxVal:(double)maxVal minLoc:(Point2i*)minLoc maxLoc:(Point2i*)maxLoc;
diff --git a/modules/core/misc/objc/src/Moments.h b/modules/core/misc/objc/src/Moments.h
 #pragma once

 #ifdef __cplusplus
 #import<opencv2/opencv.hpp>
 #import"opencv2/opencv.hpp"
 #endif

 #import <Foundation/Foundation.h>
diff --git a/modules/core/misc/objc/src/ObjectVector.mm b/modules/core/misc/objc/src/ObjectVector.mm
 }

 -(id)get:(NSInteger)index {
    if (index < 0 || index >= _array.count) {
    if (index < 0 || index >=(long)_array.count) {
        @throw [NSException exceptionWithName:NSRangeException reason:@"Invalid data length" userInfo:nil];
    }
    return _array[index];
Original file line number	Diff line number	Diff line change
Expand Up		@@ -788,6 +788,7 @@ macro(ocv_glob_module_sources)
		if (APPLE)
		file(GLOB_RECURSE lib_srcs_apple
		"${CMAKE_CURRENT_LIST_DIR}/src/*.mm"
		"${CMAKE_CURRENT_LIST_DIR}/src/*.swift"
		)
		list(APPEND lib_srcs ${lib_srcs_apple})
		endif()
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,7 +63,7 @@ +(instancetype)fromNative:(std::vector<SInt8>&)src {
		}

		-(SInt8)get:(NSInteger)index {
		if (index < 0 \|\| index >= v.size()) {
		if (index < 0 \|\| index >=(long)v.size()) {
		@throw [NSException exceptionWithName:NSRangeException reason:@"Invalid data length" userInfo:nil];
		}
		return v[index];
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,7 +41,7 @@ template <typename CV, typename CV_RAW, typename OBJC> std::vector<CV> objc2cv_c

		template <typename CV, typename OBJC> void cv2objc(std::vector<CV>& vector, NSMutableArray<OBJC> _Nonnull array, OBJC* _Nonnull (* _Nonnull converter)(CV&)) {
		[array removeAllObjects];
		for (int index = 0; index < vector.size(); index++) {
		for (size_t index = 0; index < vector.size(); index++) {
		[array addObject:converter(vector[index])];
		}
		}
Expand DownExpand Up		@@ -82,10 +82,10 @@ template <typename CV, typename CV_RAW, typename OBJC> std::vector<std::vector<C

		template <typename CV, typename OBJC> void cv2objc2(std::vector<std::vector<CV>>& vector, NSMutableArray<NSMutableArray<OBJC>>* _Nonnull array, OBJC* _Nonnull (* _Nonnull converter)(CV&)) {
		[array removeAllObjects];
		for (int index = 0; index < vector.size(); index++) {
		for (size_t index = 0; index < vector.size(); index++) {
		std::vector<CV>& innerVector = vector[index];
		NSMutableArray<OBJC> innerArray = [NSMutableArray arrayWithCapacity:innerVector.size()];
		for (int index2 = 0; index2 < innerVector.size(); index2++) {
		for (size_t index2 = 0; index2 < innerVector.size(); index2++) {
		[innerArray addObject:converter(innerVector[index2])];
		}
		[array addObject:innerArray];
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -65,7 +65,7 @@ +(instancetype)fromNative:(std::vector<double>&)src {
		}

		-(double)get:(NSInteger)index {
		if (index < 0 \|\| index >= v.size()) {
		if (index < 0 \|\| index >=(long)v.size()) {
		@throw [NSException exceptionWithName:NSRangeException reason:@"Invalid data length" userInfo:nil];
		}
		return v[index];
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,6 +12,8 @@

		#import <Foundation/Foundation.h>

		NS_ASSUME_NONNULL_BEGIN

		@class Mat;

		@interface Float4 : NSObject
Expand All		@@ -36,3 +38,5 @@
		-(BOOL)isEqual:(nullable id)other;

		@end

		NS_ASSUME_NONNULL_END
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,6 +14,8 @@

		@class Mat;

		NS_ASSUME_NONNULL_BEGIN

		@interface Float6 : NSObject

		@property float v0;
Expand All		@@ -38,3 +40,5 @@
		-(BOOL)isEqual:(nullable id)other;

		@end

		NS_ASSUME_NONNULL_END
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,7 +63,7 @@ +(instancetype)fromNative:(std::vector<float>&)src {
		}

		-(float)get:(NSInteger)index {
		if (index < 0 \|\| index >= v.size()) {
		if (index < 0 \|\| index >=(long)v.size()) {
		@throw [NSException exceptionWithName:NSRangeException reason:@"Invalid data length" userInfo:nil];
		}
		return v[index];
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,10 +8,14 @@

		#import <Foundation/Foundation.h>

		NS_ASSUME_NONNULL_BEGIN

		@interface IntOut : NSObject

		@property(readonly) int val;

		-(int*)ptr;

		@end

		NS_ASSUME_NONNULL_END
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,7 +63,7 @@ +(instancetype)fromNative:(std::vector<int>&)src {
		}

		-(int)get:(NSInteger)index {
		if (index < 0 \|\| index >= v.size()) {
		if (index < 0 \|\| index >=(long)v.size()) {
		@throw [NSException exceptionWithName:NSRangeException reason:@"Invalid data length" userInfo:nil];
		}
		return v[index];
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,5 @@
		//
		//Range.h
		//KeyPoint.h
		//
		// Created by Giles Payne on 2019/10/08.
		// Copyright © 2019 Xtravision. All rights reserved.
Expand All		@@ -13,13 +13,13 @@

		#import <Foundation/Foundation.h>

		@classCVPoint;
		@classPoint2f;

		NS_ASSUME_NONNULL_BEGIN

		@interface KeyPoint : NSObject

		@property CVPoint* pt;
		@property(assign) Point2f* pt;
		@property float size;
		@property float angle;
		@property float response;
Expand Down