Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
3b6a82b5
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,发现更多精彩内容 >>
提交
3b6a82b5
编写于
4月 05, 2013
作者:
A
Andrey Kamaev
提交者:
OpenCV Buildbot
4月 05, 2013
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #769 from apavlenko:fix_2901
上级
5163986e
4c31c26a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
6 deletion
+17
-6
modules/java/android_test/CMakeLists.txt
modules/java/android_test/CMakeLists.txt
+1
-1
modules/java/android_test/src/org/opencv/test/features2d/BruteForceHammingDescriptorMatcherTest.java
...st/features2d/BruteForceHammingDescriptorMatcherTest.java
+12
-1
modules/java/generator/src/java/core+MatOfDMatch.java
modules/java/generator/src/java/core+MatOfDMatch.java
+4
-4
未找到文件。
modules/java/android_test/CMakeLists.txt
浏览文件 @
3b6a82b5
...
...
@@ -14,7 +14,7 @@ ocv_list_filterout(opencv_test_java_files ".svn")
# copy sources out from the build tree
set
(
opencv_test_java_file_deps
""
)
foreach
(
f
${
opencv_test_java_files
}
${
ANDROID_MANIFEST_FILE
}
)
foreach
(
f
${
opencv_test_java_files
}
${
ANDROID_MANIFEST_FILE
}
".classpath"
".project"
)
add_custom_command
(
OUTPUT
"
${
opencv_test_java_bin_dir
}
/
${
f
}
"
COMMAND
${
CMAKE_COMMAND
}
-E copy
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
f
}
"
"
${
opencv_test_java_bin_dir
}
/
${
f
}
"
...
...
modules/java/android_test/src/org/opencv/test/features2d/BruteForceHammingDescriptorMatcherTest.java
浏览文件 @
3b6a82b5
package
org.opencv.test.features2d
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
...
...
@@ -204,7 +205,17 @@ public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase {
}
public
void
testRadiusMatchMatListOfListOfDMatchFloat
()
{
fail
(
"Not yet implemented"
);
Mat
train
=
getTrainDescriptors
();
Mat
query
=
getQueryDescriptors
();
ArrayList
<
MatOfDMatch
>
matches
=
new
ArrayList
<
MatOfDMatch
>();
matcher
.
radiusMatch
(
query
,
train
,
matches
,
50
.
f
);
assertEquals
(
matches
.
size
(),
4
);
assertTrue
(
matches
.
get
(
0
).
empty
());
assertMatEqual
(
matches
.
get
(
1
),
new
MatOfDMatch
(
truth
[
1
]),
EPS
);
assertMatEqual
(
matches
.
get
(
2
),
new
MatOfDMatch
(
truth
[
2
]),
EPS
);
assertTrue
(
matches
.
get
(
3
).
empty
());
}
public
void
testRadiusMatchMatListOfListOfDMatchFloatListOfMat
()
{
...
...
modules/java/generator/src/java/core+MatOfDMatch.java
浏览文件 @
3b6a82b5
...
...
@@ -16,8 +16,8 @@ public class MatOfDMatch extends Mat {
protected
MatOfDMatch
(
long
addr
)
{
super
(
addr
);
if
(
checkVector
(
_channels
,
_depth
)
<
0
)
throw
new
IllegalArgumentException
(
"Incomatible Mat
"
);
if
(
!
empty
()
&&
checkVector
(
_channels
,
_depth
)
<
0
)
throw
new
IllegalArgumentException
(
"Incomatible Mat
: "
+
toString
()
);
//FIXME: do we need release() here?
}
...
...
@@ -27,8 +27,8 @@ public class MatOfDMatch extends Mat {
public
MatOfDMatch
(
Mat
m
)
{
super
(
m
,
Range
.
all
());
if
(
checkVector
(
_channels
,
_depth
)
<
0
)
throw
new
IllegalArgumentException
(
"Incomatible Mat
"
);
if
(
!
empty
()
&&
checkVector
(
_channels
,
_depth
)
<
0
)
throw
new
IllegalArgumentException
(
"Incomatible Mat
: "
+
toString
()
);
//FIXME: do we need release() here?
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录