mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 01:13:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22300 from komakai:fix-Mat-initWithSize

Browse Source
This commit is contained in:
Alexander Alekhin 2022-07-26 01:07:07 +00:00
commit ebaf8cc06c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/misc/objc/common/Mat.mm
View File

@ -98,7 +98,7 @@ static bool updateIdx(cv::Mat* mat, std::vector<int>& indices, size_t inc) {
- (instancetype)initWithSize:(Size2i*)size type:(int)type {
self = [super init];
if (self) {
_nativePtr = new cv::Mat(size.width, size.height, type);
_nativePtr = new cv::Mat(size.height, size.width, type);
}
return self;
}
@ -128,7 +128,7 @@ static bool updateIdx(cv::Mat* mat, std::vector<int>& indices, size_t inc) {
self = [super init];
if (self) {
cv::Scalar scalerTemp(scalar.val[0].doubleValue, scalar.val[1].doubleValue, scalar.val[2].doubleValue, scalar.val[3].doubleValue);
_nativePtr = new cv::Mat(size.width, size.height, type, scalerTemp);
_nativePtr = new cv::Mat(size.height, size.width, type, scalerTemp);
}
return self;
}

6
modules/core/misc/objc/test/MatTest.swift
View File

@ -17,6 +17,12 @@ class MatTests: OpenCVTestCase {
super.tearDown()
}
func testInitWithSize() {
let size = Size(width: 7, height: 9)
let mat = Mat(size: size, type: CvType.CV_8U)
assertSizeEquals(size, mat.size())
}
func testAdjustROI() throws {
let roi = gray0.submat(rowStart: 3, rowEnd: 5, colStart: 7, colEnd: 10)
let originalroi = roi.clone()