Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
0608227e
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,发现更多精彩内容 >>
提交
0608227e
编写于
11月 16, 2017
作者:
J
Jcrist99
提交者:
Alexander Alekhin
11月 16, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge pull request #9698 from abratchik:parse.doxygen
Support @deprecated tag in java wrappers (#9698)
上级
65061948
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
45 addition
and
12 deletion
+45
-12
modules/dnn/misc/java/test/DnnTensorFlowTest.java
modules/dnn/misc/java/test/DnnTensorFlowTest.java
+0
-1
modules/features2d/misc/java/src/cpp/features2d_manual.hpp
modules/features2d/misc/java/src/cpp/features2d_manual.hpp
+11
-2
modules/java/generator/gen_java.py
modules/java/generator/gen_java.py
+34
-9
未找到文件。
modules/dnn/misc/java/test/DnnTensorFlowTest.java
浏览文件 @
0608227e
...
...
@@ -9,7 +9,6 @@ import org.opencv.core.Scalar;
import
org.opencv.core.Size
;
import
org.opencv.dnn.DictValue
;
import
org.opencv.dnn.Dnn
;
import
org.opencv.dnn.Importer
;
import
org.opencv.dnn.Layer
;
import
org.opencv.dnn.Net
;
import
org.opencv.imgcodecs.Imgcodecs
;
...
...
modules/features2d/misc/java/src/cpp/features2d_manual.hpp
浏览文件 @
0608227e
...
...
@@ -12,6 +12,9 @@
namespace
cv
{
/**
* @deprecated Please use direct instantiation of Feature2D classes
*/
class
CV_EXPORTS_AS
(
FeatureDetector
)
javaFeatureDetector
{
public:
...
...
@@ -87,8 +90,11 @@ public:
DYNAMIC_AKAZE
=
DYNAMICDETECTOR
+
AKAZE
};
//supported: FAST STAR SIFT SURF ORB MSER GFTT HARRIS BRISK AKAZE Grid(XXXX) Pyramid(XXXX) Dynamic(XXXX)
//not supported: SimpleBlob, Dense
/**
* supported: FAST STAR SIFT SURF ORB MSER GFTT HARRIS BRISK AKAZE Grid(XXXX) Pyramid(XXXX) Dynamic(XXXX)
* not supported: SimpleBlob, Dense
* @deprecated
*/
CV_WRAP
static
Ptr
<
javaFeatureDetector
>
create
(
int
detectorType
)
{
//String name;
...
...
@@ -179,6 +185,9 @@ private:
Ptr
<
FeatureDetector
>
wrapped
;
};
/**
* @deprecated
*/
class
CV_EXPORTS_AS
(
DescriptorExtractor
)
javaDescriptorExtractor
{
public:
...
...
modules/java/generator/gen_java.py
浏览文件 @
0608227e
...
...
@@ -91,8 +91,8 @@ package org.opencv.$module;
$imports
// C++: class $name
//javadoc: $name
$docs
$annotation
public class $jname extends $base {
protected $jname(long addr) { super(addr); }
...
...
@@ -107,8 +107,8 @@ package org.opencv.$module;
$imports
// C++: class $name
//javadoc: $name
$docs
$annotation
public class $jname {
protected final long nativeObj;
...
...
@@ -125,6 +125,8 @@ package org.opencv.$module;
$imports
$docs
$annotation
public class $jname {
"""
...
...
@@ -182,8 +184,22 @@ $code
"""
class
GeneralInfo
():
def
__init__
(
self
,
name
,
namespaces
):
self
.
namespace
,
self
.
classpath
,
self
.
classname
,
self
.
name
=
self
.
parseName
(
name
,
namespaces
)
def
__init__
(
self
,
type
,
decl
,
namespaces
):
self
.
namespace
,
self
.
classpath
,
self
.
classname
,
self
.
name
=
self
.
parseName
(
decl
[
0
],
namespaces
)
# parse doxygen comments
self
.
params
=
{}
self
.
annotation
=
[]
if
type
==
"class"
:
docstring
=
"// C++: class "
+
self
.
name
+
"
\n
//javadoc: "
+
self
.
name
else
:
docstring
=
""
if
len
(
decl
)
>
5
and
decl
[
5
]:
logging
.
info
(
'docstring: %s'
,
decl
[
5
])
if
re
.
search
(
"(@|
\\\\
)deprecated"
,
decl
[
5
]):
self
.
annotation
.
append
(
"@Deprecated"
)
self
.
docstring
=
docstring
def
parseName
(
self
,
name
,
namespaces
):
'''
...
...
@@ -218,7 +234,7 @@ class GeneralInfo():
class
ConstInfo
(
GeneralInfo
):
def
__init__
(
self
,
decl
,
addedManually
=
False
,
namespaces
=
[]):
GeneralInfo
.
__init__
(
self
,
decl
[
0
]
,
namespaces
)
GeneralInfo
.
__init__
(
self
,
"const"
,
decl
,
namespaces
)
self
.
cname
=
self
.
name
.
replace
(
"."
,
"::"
)
self
.
value
=
decl
[
1
]
self
.
addedManually
=
addedManually
...
...
@@ -245,7 +261,7 @@ class ClassPropInfo():
class
ClassInfo
(
GeneralInfo
):
def
__init__
(
self
,
decl
,
namespaces
=
[]):
# [ 'class/struct cname', ': base', [modlist] ]
GeneralInfo
.
__init__
(
self
,
decl
[
0
]
,
namespaces
)
GeneralInfo
.
__init__
(
self
,
"class"
,
decl
,
namespaces
)
self
.
cname
=
self
.
name
.
replace
(
"."
,
"::"
)
self
.
methods
=
[]
self
.
methods_suffixes
=
{}
...
...
@@ -335,6 +351,8 @@ class ClassInfo(GeneralInfo):
name
=
self
.
name
,
jname
=
self
.
jname
,
imports
=
"
\n
"
.
join
(
self
.
getAllImports
(
M
)),
docs
=
self
.
docstring
,
annotation
=
"
\n
"
.
join
(
self
.
annotation
),
base
=
self
.
base
)
def
generateCppCode
(
self
):
...
...
@@ -364,7 +382,7 @@ class ArgInfo():
class
FuncInfo
(
GeneralInfo
):
def
__init__
(
self
,
decl
,
namespaces
=
[]):
# [ funcname, return_ctype, [modifiers], [args] ]
GeneralInfo
.
__init__
(
self
,
decl
[
0
]
,
namespaces
)
GeneralInfo
.
__init__
(
self
,
"func"
,
decl
,
namespaces
)
self
.
cname
=
self
.
name
.
replace
(
"."
,
"::"
)
self
.
jname
=
self
.
name
self
.
isconstructor
=
self
.
name
==
self
.
classname
...
...
@@ -741,6 +759,13 @@ class JavaWrapperGenerator(object):
java_doc
=
"//javadoc: "
+
f_name
+
"(%s)"
%
", "
.
join
([
a
.
name
for
a
in
args
if
a
.
ctype
])
j_code
.
write
(
" "
*
4
+
java_doc
+
"
\n
"
)
if
fi
.
docstring
:
lines
=
StringIO
(
fi
.
docstring
)
for
line
in
lines
:
j_code
.
write
(
" "
*
4
+
line
+
"
\n
"
)
if
fi
.
annotation
:
j_code
.
write
(
" "
*
4
+
"
\n
"
.
join
(
fi
.
annotation
)
+
"
\n
"
)
# public java wrapper method impl (calling native one above)
# e.g.
# public static void add( Mat src1, Mat src2, Mat dst, Mat mask, int dtype )
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录