Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
61cddd8b
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
61cddd8b
编写于
10月 16, 2014
作者:
V
Vadim Pisarevsky
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed opencv_java build
上级
25a7d023
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
46 addition
and
53 deletion
+46
-53
modules/features2d/src/mser.cpp
modules/features2d/src/mser.cpp
+1
-1
modules/features2d/test/test_keypoints.cpp
modules/features2d/test/test_keypoints.cpp
+0
-3
modules/java/generator/src/cpp/features2d_manual.hpp
modules/java/generator/src/cpp/features2d_manual.hpp
+45
-43
modules/java/generator/src/cpp/jni_part.cpp
modules/java/generator/src/cpp/jni_part.cpp
+0
-6
未找到文件。
modules/features2d/src/mser.cpp
浏览文件 @
61cddd8b
...
...
@@ -673,7 +673,7 @@ static int preprocessMSER_8uC3( MSCRNode* node,
int
Ne
,
int
edgeBlurSize
)
{
int
srccpt
=
src
.
step
-
src
.
cols
*
3
;
int
srccpt
=
(
int
)(
src
.
step
-
src
.
cols
*
3
)
;
const
uchar
*
srcptr
=
src
.
ptr
();
const
uchar
*
lastptr
=
srcptr
+
3
;
double
*
dxptr
=
dx
.
ptr
<
double
>
();
...
...
modules/features2d/test/test_keypoints.cpp
浏览文件 @
61cddd8b
...
...
@@ -75,9 +75,6 @@ protected:
}
vector
<
KeyPoint
>
keypoints
;
vector
<
vector
<
Point
>
>
msers
;
CvMat
src
=
image
;
detector
->
detect
(
image
,
keypoints
);
if
(
keypoints
.
empty
())
...
...
modules/java/generator/src/cpp/features2d_manual.hpp
浏览文件 @
61cddd8b
...
...
@@ -90,67 +90,68 @@ public:
//not supported: SimpleBlob, Dense
CV_WRAP
static
javaFeatureDetector
*
create
(
int
detectorType
)
{
String
name
;
//
String name;
if
(
detectorType
>
DYNAMICDETECTOR
)
{
name
=
"Dynamic"
;
//
name = "Dynamic";
detectorType
-=
DYNAMICDETECTOR
;
}
if
(
detectorType
>
PYRAMIDDETECTOR
)
{
name
=
"Pyramid"
;
//
name = "Pyramid";
detectorType
-=
PYRAMIDDETECTOR
;
}
if
(
detectorType
>
GRIDDETECTOR
)
{
name
=
"Grid"
;
//
name = "Grid";
detectorType
-=
GRIDDETECTOR
;
}
Ptr
<
FeatureDetector
>
fd
;
switch
(
detectorType
)
{
case
FAST
:
name
=
name
+
"FAST"
;
break
;
case
STAR
:
name
=
name
+
"STAR"
;
break
;
case
SIFT
:
name
=
name
+
"SIFT"
;
break
;
case
SURF
:
name
=
name
+
"SURF"
;
fd
=
FastFeatureDetector
::
create
();
break
;
//case STAR:
// fd = xfeatures2d::StarDetector::create();
// break;
//case SIFT:
// name = name + "SIFT";
// break;
//case SURF:
// name = name + "SURF";
// break;
case
ORB
:
name
=
name
+
"ORB"
;
fd
=
ORB
::
create
()
;
break
;
case
MSER
:
name
=
name
+
"MSER"
;
fd
=
MSER
::
create
()
;
break
;
case
GFTT
:
name
=
name
+
"GFTT"
;
fd
=
GFTTDetector
::
create
()
;
break
;
case
HARRIS
:
name
=
name
+
"HARRIS"
;
fd
=
GFTTDetector
::
create
()
;
break
;
case
SIMPLEBLOB
:
name
=
name
+
"SimpleBlob"
;
break
;
case
DENSE
:
name
=
name
+
"Dense"
;
fd
=
SimpleBlobDetector
::
create
();
break
;
//case DENSE:
// name = name + "Dense";
// break;
case
BRISK
:
name
=
name
+
"BRISK"
;
fd
=
BRISK
::
create
()
;
break
;
case
AKAZE
:
name
=
name
+
"AKAZE"
;
fd
=
AKAZE
::
create
()
;
break
;
default:
CV_Error
(
Error
::
StsBadArg
,
"Specified feature detector type is not supported."
);
break
;
}
return
new
javaFeatureDetector
(
FeatureDetector
::
create
(
name
)
);
return
new
javaFeatureDetector
(
fd
);
}
CV_WRAP
void
write
(
const
String
&
fileName
)
const
...
...
@@ -332,43 +333,44 @@ public:
//not supported: Calonder
CV_WRAP
static
javaDescriptorExtractor
*
create
(
int
extractorType
)
{
String
name
;
//
String name;
if
(
extractorType
>
OPPONENTEXTRACTOR
)
{
name
=
"Opponent"
;
//
name = "Opponent";
extractorType
-=
OPPONENTEXTRACTOR
;
}
Ptr
<
DescriptorExtractor
>
de
;
switch
(
extractorType
)
{
case
SIFT
:
name
=
name
+
"SIFT"
;
break
;
case
SURF
:
name
=
name
+
"SURF"
;
break
;
//
case SIFT:
//
name = name + "SIFT";
//
break;
//
case SURF:
//
name = name + "SURF";
//
break;
case
ORB
:
name
=
name
+
"ORB"
;
break
;
case
BRIEF
:
name
=
name
+
"BRIEF"
;
de
=
ORB
::
create
();
break
;
//case BRIEF:
// name = name + "BRIEF";
// break;
case
BRISK
:
name
=
name
+
"BRISK"
;
break
;
case
FREAK
:
name
=
name
+
"FREAK"
;
de
=
BRISK
::
create
();
break
;
//case FREAK:
// name = name + "FREAK";
// break;
case
AKAZE
:
name
=
name
+
"AKAZE"
;
de
=
AKAZE
::
create
()
;
break
;
default:
CV_Error
(
Error
::
StsBadArg
,
"Specified descriptor extractor type is not supported."
);
break
;
}
return
new
javaDescriptorExtractor
(
DescriptorExtractor
::
create
(
name
)
);
return
new
javaDescriptorExtractor
(
de
);
}
CV_WRAP
void
write
(
const
String
&
fileName
)
const
...
...
modules/java/generator/src/cpp/jni_part.cpp
浏览文件 @
61cddd8b
...
...
@@ -24,15 +24,9 @@ JNI_OnLoad(JavaVM* vm, void* )
return
-
1
;
bool
init
=
true
;
#ifdef HAVE_OPENCV_FEATURES2D
init
&=
cv
::
initModule_features2d
();
#endif
#ifdef HAVE_OPENCV_VIDEO
init
&=
cv
::
initModule_video
();
#endif
#ifdef HAVE_OPENCV_CONTRIB
init
&=
cv
::
initModule_contrib
();
#endif
if
(
!
init
)
return
-
1
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录