Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
79cf292d
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,发现更多精彩内容 >>
提交
79cf292d
编写于
2月 28, 2013
作者:
A
Andrey Kamaev
提交者:
OpenCV Buildbot
2月 28, 2013
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #590 from apavlenko:java_fixes
上级
1018d110
d18b2c25
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
38 addition
and
13 deletion
+38
-13
modules/java/CMakeLists.txt
modules/java/CMakeLists.txt
+9
-3
modules/java/generator/gen_java.py
modules/java/generator/gen_java.py
+19
-7
samples/java/ant/src/SimpleSample.java
samples/java/ant/src/SimpleSample.java
+3
-1
samples/java/eclipse/HelloCV/src/Main.java
samples/java/eclipse/HelloCV/src/Main.java
+3
-1
samples/java/sbt/src/main/scala/Main.scala
samples/java/sbt/src/main/scala/Main.scala
+4
-1
未找到文件。
modules/java/CMakeLists.txt
浏览文件 @
79cf292d
...
...
@@ -217,6 +217,12 @@ endif(ANDROID AND ANDROID_EXECUTABLE)
set
(
step3_depends
${
step2_depends
}
${
step3_input_files
}
${
copied_files
}
)
if
(
ANDROID
)
set
(
LIB_NAME_SUFIX
""
)
else
()
set
(
LIB_NAME_SUFIX
"
${
OPENCV_VERSION_MAJOR
}${
OPENCV_VERSION_MINOR
}${
OPENCV_VERSION_PATCH
}
"
)
endif
()
# step 4: build jar
if
(
ANDROID
)
set
(
JAR_FILE
"
${
OpenCV_BINARY_DIR
}
/bin/classes.jar"
)
...
...
@@ -241,7 +247,7 @@ if(ANDROID)
)
endif
()
else
(
ANDROID
)
set
(
JAR_NAME opencv-
${
OPENCV_VERSION
}
.jar
)
set
(
JAR_NAME opencv-
${
LIB_NAME_SUFIX
}
.jar
)
set
(
JAR_FILE
"
${
OpenCV_BINARY_DIR
}
/bin/
${
JAR_NAME
}
"
)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/build.xml.in"
"
${
OpenCV_BINARY_DIR
}
/build.xml"
IMMEDIATE @ONLY
)
list
(
APPEND step3_depends
"
${
OpenCV_BINARY_DIR
}
/build.xml"
)
...
...
@@ -294,8 +300,8 @@ endif()
# Additional target properties
set_target_properties
(
${
the_module
}
PROPERTIES
OUTPUT_NAME
"
${
the_module
}${
OPENCV_DLLVERSION
}
"
DEBUG_POSTFIX
"
${
OPENCV_DEBUG_POSTFIX
}
"
OUTPUT_NAME
"
${
the_module
}${
LIB_NAME_SUFIX
}
"
#
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
ARCHIVE_OUTPUT_DIRECTORY
${
LIBRARY_OUTPUT_PATH
}
RUNTIME_OUTPUT_DIRECTORY
${
EXECUTABLE_OUTPUT_PATH
}
INSTALL_NAME_DIR
${
OPENCV_LIB_INSTALL_PATH
}
...
...
modules/java/generator/gen_java.py
浏览文件 @
79cf292d
...
...
@@ -559,6 +559,15 @@ func_arg_fix = {
},
# '', i.e. no class
}
# func_arg_fix
def
getLibVersion
(
version_hpp_path
):
version_file
=
open
(
version_hpp_path
,
"rt"
).
read
()
epoch
=
re
.
search
(
"^W*#\W*define\W+CV_VERSION_EPOCH\W+(\d+)\W*$"
,
version_file
,
re
.
MULTILINE
).
group
(
1
)
major
=
re
.
search
(
"^W*#\W*define\W+CV_VERSION_MAJOR\W+(\d+)\W*$"
,
version_file
,
re
.
MULTILINE
).
group
(
1
)
minor
=
re
.
search
(
"^W*#\W*define\W+CV_VERSION_MINOR\W+(\d+)\W*$"
,
version_file
,
re
.
MULTILINE
).
group
(
1
)
revision
=
re
.
search
(
"^W*#\W*define\W+CV_VERSION_REVISION\W+(\d+)\W*$"
,
version_file
,
re
.
MULTILINE
).
group
(
1
)
return
(
epoch
,
major
,
minor
,
revision
)
class
ConstInfo
(
object
):
def
__init__
(
self
,
cname
,
name
,
val
,
addedManually
=
False
):
self
.
cname
=
cname
...
...
@@ -721,13 +730,16 @@ $imports
public class %(jc)s {
"""
%
{
'm'
:
self
.
module
,
'jc'
:
jname
}
)
# self.java_code[class_name]["jn_code"].write("""
# //
# // native stuff
# //
# static { System.loadLibrary("opencv_java"); }
#""" )
if
class_name
==
'Core'
:
(
epoch
,
major
,
minor
,
revision
)
=
getLibVersion
(
(
os
.
path
.
dirname
(
__file__
)
or
'.'
)
+
'/../../core/include/opencv2/core/version.hpp'
)
version_str
=
'.'
.
join
(
(
epoch
,
major
,
minor
,
revision
)
)
version_suffix
=
''
.
join
(
(
epoch
,
major
,
minor
)
)
self
.
classes
[
class_name
].
imports
.
add
(
"java.lang.String"
)
self
.
java_code
[
class_name
][
"j_code"
].
write
(
"""
public static final String VERSION = "%(v)s", NATIVE_LIBRARY_NAME = "opencv_java%(vs)s";
public static final int VERSION_EPOCH = %(ep)s, VERSION_MAJOR = %(ma)s, VERSION_MINOR = %(mi)s, VERSION_REVISION = %(re)s;
"""
%
{
'v'
:
version_str
,
'vs'
:
version_suffix
,
'ep'
:
epoch
,
'ma'
:
major
,
'mi'
:
minor
,
're'
:
revision
}
)
def
add_class
(
self
,
decl
):
...
...
samples/java/ant/src/SimpleSample.java
浏览文件 @
79cf292d
import
org.opencv.core.Core
;
import
org.opencv.core.Mat
;
import
org.opencv.core.CvType
;
import
org.opencv.core.Scalar
;
class
SimpleSample
{
static
{
System
.
loadLibrary
(
"opencv_java244"
);
}
static
{
System
.
loadLibrary
(
Core
.
NATIVE_LIBRARY_NAME
);
}
public
static
void
main
(
String
[]
args
)
{
System
.
out
.
println
(
"Welcome to OpenCV "
+
Core
.
VERSION
);
Mat
m
=
new
Mat
(
5
,
10
,
CvType
.
CV_8UC1
,
new
Scalar
(
0
));
System
.
out
.
println
(
"OpenCV Mat: "
+
m
);
Mat
mr1
=
m
.
row
(
1
);
...
...
samples/java/eclipse/HelloCV/src/Main.java
浏览文件 @
79cf292d
import
org.opencv.core.Core
;
import
org.opencv.core.CvType
;
import
org.opencv.core.Mat
;
public
class
Main
{
public
static
void
main
(
String
[]
args
)
{
System
.
loadLibrary
(
"opencv_java244"
);
System
.
out
.
println
(
"Welcome to OpenCV "
+
Core
.
VERSION
);
System
.
loadLibrary
(
Core
.
NATIVE_LIBRARY_NAME
);
Mat
m
=
Mat
.
eye
(
3
,
3
,
CvType
.
CV_8UC1
);
System
.
out
.
println
(
"m = "
+
m
.
dump
());
}
...
...
samples/java/sbt/src/main/scala/Main.scala
浏览文件 @
79cf292d
...
...
@@ -8,11 +8,14 @@
* You're invited to submit your own examples, in any JVM language of
* your choosing so long as you can get them to build.
*/
import
org.opencv.core.Core
object
Main
extends
App
{
// We must load the native library before using any OpenCV functions.
// You must load this library _exactly once_ per Java invocation.
// If you load it more than once, you will get a java.lang.UnsatisfiedLinkError.
System
.
loadLibrary
(
"opencv_java"
)
System
.
loadLibrary
(
Core
.
NATIVE_LIBRARY_NAME
)
ScalaCorrespondenceMatchingDemo
.
run
()
ScalaDetectFaceDemo
.
run
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录