Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
c1c1a376
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,发现更多精彩内容 >>
提交
c1c1a376
编写于
4月 28, 2012
作者:
A
Alexander Smorkalov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
bad changes reverted.
上级
a9d9eb1a
变更
7
展开全部
隐藏空白更改
内联
并排
Showing
7 changed file
with
2032 addition
and
2219 deletion
+2032
-2219
modules/java/src/java/AsyncServiceHelper.java
modules/java/src/java/AsyncServiceHelper.java
+0
-165
modules/java/src/java/LoaderCallbackInterface.java
modules/java/src/java/LoaderCallbackInterface.java
+0
-6
modules/java/src/java/OpenCVLoader.java
modules/java/src/java/OpenCVLoader.java
+0
-40
modules/java/src/java/android+Utils.java
modules/java/src/java/android+Utils.java
+5
-0
modules/java/src/java/core+Mat.java
modules/java/src/java/core+Mat.java
+1291
-1284
modules/java/src/java/highgui+VideoCapture.java
modules/java/src/java/highgui+VideoCapture.java
+6
-0
modules/java/src/java/utils+Converters.java
modules/java/src/java/utils+Converters.java
+730
-724
未找到文件。
modules/java/src/java/AsyncServiceHelper.java
已删除
100644 → 0
浏览文件 @
a9d9eb1a
package
org.opencv.android
;
import
java.io.File
;
import
java.util.StringTokenizer
;
import
org.opencv.engine.OpenCVEngineInterface
;
import
android.content.ComponentName
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.ServiceConnection
;
import
android.os.IBinder
;
import
android.os.RemoteException
;
import
android.util.Log
;
public
class
AsyncServiceHelper
{
public
static
int
initOpenCV
(
String
Version
,
Context
AppContext
,
LoaderCallbackInterface
Callback
)
{
AsyncServiceHelper
helper
=
new
AsyncServiceHelper
(
Version
,
AppContext
,
Callback
);
if
(
AppContext
.
bindService
(
new
Intent
(
"org.opencv.engine.BIND"
),
helper
.
mServiceConnection
,
Context
.
BIND_AUTO_CREATE
))
{
return
OpenCVLoader
.
Success
;
}
else
{
return
OpenCVLoader
.
NoService
;
}
}
protected
AsyncServiceHelper
(
String
Version
,
Context
AppContext
,
LoaderCallbackInterface
Callback
)
{
mOpenCVersion
=
Version
;
mUserAppCallback
=
Callback
;
mAppContext
=
AppContext
;
}
protected
static
final
String
TAG
=
"OpenCvEngine/Helper"
;
protected
OpenCVEngineInterface
mEngineService
;
protected
LoaderCallbackInterface
mUserAppCallback
;
protected
String
mOpenCVersion
;
protected
Context
mAppContext
;
protected
int
mStatus
=
OpenCVLoader
.
Success
;
protected
ServiceConnection
mServiceConnection
=
new
ServiceConnection
()
{
public
void
onServiceConnected
(
ComponentName
className
,
IBinder
service
)
{
Log
.
d
(
TAG
,
"Service connection created"
);
mEngineService
=
OpenCVEngineInterface
.
Stub
.
asInterface
(
service
);
if
(
null
==
mEngineService
)
{
Log
.
d
(
TAG
,
"Engine connection fails. May be service was not installed?"
);
mStatus
=
OpenCVLoader
.
NoService
;
}
else
{
try
{
Log
.
d
(
TAG
,
"Trying to get library path"
);
String
path
=
mEngineService
.
getLibPathByVersion
(
mOpenCVersion
);
if
((
null
==
path
)
||
(
path
.
length
()
==
0
))
{
if
(
mEngineService
.
installVersion
(
mOpenCVersion
))
{
mStatus
=
OpenCVLoader
.
RestartRequired
;
}
else
{
Log
.
d
(
TAG
,
"OpenCV package was not installed!"
);
mStatus
=
OpenCVLoader
.
MarketError
;
}
}
else
{
Log
.
d
(
TAG
,
"Trying to get library list"
);
String
libs
=
mEngineService
.
getLibraryList
(
mOpenCVersion
);
Log
.
d
(
TAG
,
"Library list: \""
+
libs
+
"\""
);
Log
.
d
(
TAG
,
"First attempt to load libs"
);
if
(
initOpenCVLibs
(
path
,
libs
))
{
Log
.
d
(
TAG
,
"First attempt to load libs is OK"
);
mStatus
=
OpenCVLoader
.
Success
;
}
else
{
Log
.
d
(
TAG
,
"First attempt to load libs fails"
);
mStatus
=
OpenCVLoader
.
InitFailed
;
}
}
}
catch
(
RemoteException
e
)
{
e
.
printStackTrace
();
mStatus
=
OpenCVLoader
.
InitFailed
;
}
}
Log
.
d
(
TAG
,
"Init finished with status "
+
mStatus
);
Log
.
d
(
TAG
,
"Unbind from service"
);
mAppContext
.
unbindService
(
mServiceConnection
);
Log
.
d
(
TAG
,
"Calling using callback"
);
mUserAppCallback
.
onEngineConnected
(
mStatus
);
}
private
boolean
loadLibrary
(
String
AbsPath
)
{
boolean
result
=
true
;
Log
.
d
(
TAG
,
"Trying to load library "
+
AbsPath
);
try
{
System
.
load
(
AbsPath
);
Log
.
d
(
TAG
,
"OpenCV libs init was ok!"
);
}
catch
(
Exception
e
)
{
Log
.
d
(
TAG
,
"Cannot load library \""
+
AbsPath
+
"\""
);
e
.
printStackTrace
();
result
&=
false
;
}
return
result
;
}
private
boolean
initOpenCVLibs
(
String
Path
,
String
Libs
)
{
Log
.
d
(
TAG
,
"Trying to init OpenCV libs"
);
if
((
null
!=
Path
)
&&
(
Path
.
length
()
!=
0
))
{
boolean
result
=
true
;
if
((
null
!=
Libs
)
&&
(
Libs
.
length
()
!=
0
))
{
Log
.
d
(
TAG
,
"Trying to load libs by dependency list"
);
StringTokenizer
splitter
=
new
StringTokenizer
(
Libs
,
";"
);
while
(
splitter
.
hasMoreTokens
())
{
String
AbsLibraryPath
=
Path
+
File
.
separator
+
splitter
.
nextToken
();
result
&=
loadLibrary
(
AbsLibraryPath
);
}
}
else
{
// If dependencies list is not defined or empty
String
AbsLibraryPath
=
Path
+
File
.
separator
+
"libopencv_java.so"
;
result
&=
loadLibrary
(
AbsLibraryPath
);
}
return
result
;
}
else
{
Log
.
d
(
TAG
,
"Library path \""
+
Path
+
"\" is empty"
);
return
false
;
}
}
public
void
onServiceDisconnected
(
ComponentName
className
)
{
mEngineService
=
null
;
}
};
}
modules/java/src/java/LoaderCallbackInterface.java
已删除
100644 → 0
浏览文件 @
a9d9eb1a
package
org.opencv.android
;
public
interface
LoaderCallbackInterface
{
public
void
onEngineConnected
(
int
status
);
};
modules/java/src/java/OpenCVLoader.java
已删除
100644 → 0
浏览文件 @
a9d9eb1a
package
org.opencv.android
;
import
android.content.Context
;
import
android.util.Log
;
public
class
OpenCVLoader
{
public
static
final
int
Success
=
0
;
public
static
final
int
NoService
=
1
;
public
static
final
int
RestartRequired
=
2
;
public
static
final
int
MarketError
=
3
;
public
static
final
int
InitFailed
=
0xff
;
public
static
int
initStatic
()
{
int
result
;
try
{
System
.
loadLibrary
(
"opencv_java"
);
result
=
Success
;
}
catch
(
Exception
e
)
{
Log
.
e
(
TAG
,
"OpenCV error: Cannot load native library"
);
e
.
printStackTrace
();
result
=
InitFailed
;
}
return
result
;
}
public
static
int
initAsync
(
String
Version
,
Context
AppContext
,
LoaderCallbackInterface
Callback
)
{
return
AsyncServiceHelper
.
initOpenCV
(
Version
,
AppContext
,
Callback
);
}
private
static
final
String
TAG
=
"OpenCV/Helper"
;
}
modules/java/src/java/android+Utils.java
浏览文件 @
c1c1a376
...
...
@@ -113,6 +113,11 @@ public class Utils {
nMatToBitmap
(
m
.
nativeObj
,
b
);
}
// native stuff
static
{
System
.
loadLibrary
(
"opencv_java"
);
}
private
static
native
void
nBitmapToMat
(
Bitmap
b
,
long
m_addr
);
private
static
native
void
nMatToBitmap
(
long
m_addr
,
Bitmap
b
);
...
...
modules/java/src/java/core+Mat.java
浏览文件 @
c1c1a376
此差异已折叠。
点击以展开。
modules/java/src/java/highgui+VideoCapture.java
浏览文件 @
c1c1a376
...
...
@@ -194,6 +194,12 @@ public class VideoCapture {
super
.
finalize
();
}
// native stuff
static
{
System
.
loadLibrary
(
"opencv_java"
);
}
// C++: VideoCapture::VideoCapture()
private
static
native
long
n_VideoCapture
();
...
...
modules/java/src/java/utils+Converters.java
浏览文件 @
c1c1a376
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录