Skip to content

Commit 644901a

Browse files
Merge pull request #21 from lukaszkurantdev/fix/arguments-types-in-morphologyex
fix: argument types in morphology fuctions and functions arguments
2 parents 1c99e2a + 357eca1 commit 644901a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

cpp/FOCV_Function.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ jsi::Object FOCV_Function::invoke(jsi::Runtime& runtime, const jsi::Value* argum
11141114
auto shape = args.asNumber(1);
11151115
auto ksize = args.asSizePtr(2);
11161116

1117-
if (args.isPoint(3)) {
1117+
if (args.isObject(3) && args.isPoint(3)) {
11181118
auto anchor = args.asPointPtr(3);
11191119
cv::Mat result = cv::getStructuringElement(shape, *ksize, *anchor);
11201120
id = FOCV_Storage::save(result);
@@ -1155,7 +1155,7 @@ jsi::Object FOCV_Function::invoke(jsi::Runtime& runtime, const jsi::Value* argum
11551155
auto op = args.asNumber(3);
11561156
auto kernel = args.asMatPtr(4);
11571157

1158-
if(args.isPoint(5)) {
1158+
if(args.isObject(5) && args.isPoint(5)) {
11591159
auto anchor = args.asPointPtr(5);
11601160

11611161
if(args.isNumber(6)) {
@@ -1164,7 +1164,7 @@ jsi::Object FOCV_Function::invoke(jsi::Runtime& runtime, const jsi::Value* argum
11641164
if(args.isNumber(7)) {
11651165
auto borderType = args.asNumber(7);
11661166

1167-
if(args.isScalar(8)) {
1167+
if(args.isObject(8) && args.isScalar(8)) {
11681168
auto borderValue = args.asScalarPtr(8);
11691169
cv::morphologyEx(*src, *dst, op, *kernel, *anchor, iterations, borderType, *borderValue);
11701170
break;

cpp/FOCV_FunctionArguments.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ bool FOCV_FunctionArguments::isNumber(int index) {
7676
}
7777

7878
bool FOCV_FunctionArguments::isBool(int index) {
79-
return this->arguments[index].isNumber();
79+
return this->arguments[index].isBool();
8080
}
8181

8282
bool FOCV_FunctionArguments::isString(int index) {
83-
return this->arguments[index].isNumber();
83+
return this->arguments[index].isString();
8484
}
8585

8686
bool FOCV_FunctionArguments::isObject(int index) {
87-
return this->arguments[index].isNumber();
87+
return this->arguments[index].isObject();
8888
}
8989

9090
bool FOCV_FunctionArguments::isMat(int index) {

0 commit comments

Comments
 (0)