Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
c6b60e21
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c6b60e21
编写于
5月 29, 2020
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17428 from asmorkalov:as/java_smart_constructors
上级
740f6628
821fac18
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
3 deletion
+30
-3
modules/features2d/misc/java/test/BruteForceDescriptorMatcherTest.java
...res2d/misc/java/test/BruteForceDescriptorMatcherTest.java
+10
-0
modules/features2d/misc/java/test/FlannBasedDescriptorMatcherTest.java
...res2d/misc/java/test/FlannBasedDescriptorMatcherTest.java
+10
-0
modules/java/generator/gen_java.py
modules/java/generator/gen_java.py
+10
-3
未找到文件。
modules/features2d/misc/java/test/BruteForceDescriptorMatcherTest.java
浏览文件 @
c6b60e21
...
...
@@ -12,6 +12,7 @@ import org.opencv.core.Point;
import
org.opencv.core.Scalar
;
import
org.opencv.core.DMatch
;
import
org.opencv.features2d.DescriptorMatcher
;
import
org.opencv.features2d.BFMatcher
;
import
org.opencv.core.KeyPoint
;
import
org.opencv.test.OpenCVTestCase
;
import
org.opencv.test.OpenCVTestRunner
;
...
...
@@ -93,6 +94,15 @@ public class BruteForceDescriptorMatcherTest extends OpenCVTestCase {
};
}
// https://github.com/opencv/opencv/issues/11268
public
void
testConstructor
()
{
BFMatcher
self_created_matcher
=
new
BFMatcher
();
Mat
train
=
new
Mat
(
1
,
1
,
CvType
.
CV_8U
,
new
Scalar
(
123
));
self_created_matcher
.
add
(
Arrays
.
asList
(
train
));
assertTrue
(!
self_created_matcher
.
empty
());
}
public
void
testAdd
()
{
matcher
.
add
(
Arrays
.
asList
(
new
Mat
()));
assertFalse
(
matcher
.
empty
());
...
...
modules/features2d/misc/java/test/FlannBasedDescriptorMatcherTest.java
浏览文件 @
c6b60e21
...
...
@@ -12,6 +12,7 @@ import org.opencv.core.Point;
import
org.opencv.core.Scalar
;
import
org.opencv.core.DMatch
;
import
org.opencv.features2d.DescriptorMatcher
;
import
org.opencv.features2d.FlannBasedMatcher
;
import
org.opencv.core.KeyPoint
;
import
org.opencv.test.OpenCVTestCase
;
import
org.opencv.test.OpenCVTestRunner
;
...
...
@@ -168,6 +169,15 @@ public class FlannBasedDescriptorMatcherTest extends OpenCVTestCase {
};
}
// https://github.com/opencv/opencv/issues/11268
public
void
testConstructor
()
{
FlannBasedMatcher
self_created_matcher
=
new
FlannBasedMatcher
();
Mat
train
=
new
Mat
(
1
,
1
,
CvType
.
CV_8U
,
new
Scalar
(
123
));
self_created_matcher
.
add
(
Arrays
.
asList
(
train
));
assertTrue
(!
self_created_matcher
.
empty
());
}
public
void
testAdd
()
{
matcher
.
add
(
Arrays
.
asList
(
new
Mat
()));
assertFalse
(
matcher
.
empty
());
...
...
modules/java/generator/gen_java.py
浏览文件 @
c6b60e21
...
...
@@ -877,7 +877,10 @@ class JavaWrapperGenerator(object):
ret
=
""
default
=
""
elif
not
fi
.
ctype
:
# c-tor
ret
=
"return (jlong) _retval_;"
if
self
.
isSmartClass
(
ci
):
ret
=
"return (jlong)(new Ptr<%(ctype)s>(_retval_));"
%
{
'ctype'
:
fi
.
fullClass
(
isCPP
=
True
)
}
else
:
ret
=
"return (jlong) _retval_;"
elif
"v_type"
in
type_dict
[
fi
.
ctype
]:
# c-tor
if
type_dict
[
fi
.
ctype
][
"v_type"
]
in
(
"Mat"
,
"vector_Mat"
):
ret
=
"return (jlong) _retval_;"
...
...
@@ -920,8 +923,12 @@ class JavaWrapperGenerator(object):
c_epilogue
.
append
(
"return "
+
fi
.
ctype
+
"_to_List(env, _ret_val_vector_);"
)
if
fi
.
classname
:
if
not
fi
.
ctype
:
# c-tor
retval
=
fi
.
fullClass
(
isCPP
=
True
)
+
"* _retval_ = "
cvname
=
"new "
+
fi
.
fullClass
(
isCPP
=
True
)
if
self
.
isSmartClass
(
ci
):
retval
=
self
.
smartWrap
(
ci
,
fi
.
fullClass
(
isCPP
=
True
))
+
" _retval_ = "
cvname
=
"makePtr<"
+
fi
.
fullClass
(
isCPP
=
True
)
+
">"
else
:
retval
=
fi
.
fullClass
(
isCPP
=
True
)
+
"* _retval_ = "
cvname
=
"new "
+
fi
.
fullClass
(
isCPP
=
True
)
elif
fi
.
static
:
cvname
=
fi
.
fullName
(
isCPP
=
True
)
else
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录