Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
6d89e1f4
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,发现更多精彩内容 >>
提交
6d89e1f4
编写于
4月 29, 2013
作者:
A
Andrey Pavlenko
提交者:
OpenCV Buildbot
4月 29, 2013
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #827 from apavlenko:fix_android_tutorial1
上级
2068c458
8c40f0cc
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
9 addition
and
14 deletion
+9
-14
modules/java/android_lib/lint.xml
modules/java/android_lib/lint.xml
+3
-0
modules/java/generator/src/java/android+CameraBridgeViewBase.java
...java/generator/src/java/android+CameraBridgeViewBase.java
+1
-2
modules/java/generator/src/java/android+JavaCameraView.java
modules/java/generator/src/java/android+JavaCameraView.java
+0
-3
modules/java/generator/src/java/android+NativeCameraView.java
...les/java/generator/src/java/android+NativeCameraView.java
+3
-6
samples/android/native-activity/src/org/opencv/samples/NativeActivity/CvNativeActivity.java
...c/org/opencv/samples/NativeActivity/CvNativeActivity.java
+0
-1
samples/android/tutorial-1-camerapreview/res/layout/tutorial1_surface_view.xml
...ial-1-camerapreview/res/layout/tutorial1_surface_view.xml
+2
-2
未找到文件。
modules/java/android_lib/lint.xml
浏览文件 @
6d89e1f4
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<issue
id=
"InlinedApi"
>
<ignore
path=
"src\org\opencv\android\JavaCameraView.java"
/>
</issue>
<issue
id=
"NewApi"
>
<ignore
path=
"src\org\opencv\android\JavaCameraView.java"
/>
</issue>
...
...
modules/java/generator/src/java/android+CameraBridgeViewBase.java
浏览文件 @
6d89e1f4
...
...
@@ -74,6 +74,7 @@ public abstract class CameraBridgeViewBase extends SurfaceView implements Surfac
getHolder
().
addCallback
(
this
);
mMaxWidth
=
MAX_UNSPECIFIED
;
mMaxHeight
=
MAX_UNSPECIFIED
;
styledAttrs
.
recycle
();
}
public
interface
CvCameraViewListener
{
...
...
@@ -155,8 +156,6 @@ public abstract class CameraBridgeViewBase extends SurfaceView implements Surfac
mPreviewFormat
=
format
;
}
private
CvCameraViewListenerAdapter
()
{}
private
int
mPreviewFormat
=
Highgui
.
CV_CAP_ANDROID_COLOR_FRAME_RGBA
;
private
CvCameraViewListener
mOldStyleListener
;
};
...
...
modules/java/generator/src/java/android+JavaCameraView.java
浏览文件 @
6d89e1f4
...
...
@@ -267,9 +267,6 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb
mRgba
.
release
();
}
private
JavaCameraFrame
(
CvCameraViewFrame
obj
)
{
}
private
Mat
mYuvFrameData
;
private
Mat
mRgba
;
private
int
mWidth
;
...
...
modules/java/generator/src/java/android+NativeCameraView.java
浏览文件 @
6d89e1f4
...
...
@@ -131,17 +131,17 @@ public class NativeCameraView extends CameraBridgeViewBase {
}
}
private
class
NativeCameraFrame
implements
CvCameraViewFrame
{
private
static
class
NativeCameraFrame
implements
CvCameraViewFrame
{
@Override
public
Mat
rgba
()
{
mCa
mera
.
retrieve
(
mRgba
,
Highgui
.
CV_CAP_ANDROID_COLOR_FRAME_RGBA
);
mCa
pture
.
retrieve
(
mRgba
,
Highgui
.
CV_CAP_ANDROID_COLOR_FRAME_RGBA
);
return
mRgba
;
}
@Override
public
Mat
gray
()
{
mCa
mera
.
retrieve
(
mGray
,
Highgui
.
CV_CAP_ANDROID_GREY_FRAME
);
mCa
pture
.
retrieve
(
mGray
,
Highgui
.
CV_CAP_ANDROID_GREY_FRAME
);
return
mGray
;
}
...
...
@@ -158,9 +158,6 @@ public class NativeCameraView extends CameraBridgeViewBase {
private
class
CameraWorker
implements
Runnable
{
private
Mat
mRgba
=
new
Mat
();
private
Mat
mGray
=
new
Mat
();
public
void
run
()
{
do
{
if
(!
mCamera
.
grab
())
{
...
...
samples/android/native-activity/src/org/opencv/samples/NativeActivity/CvNativeActivity.java
浏览文件 @
6d89e1f4
...
...
@@ -6,7 +6,6 @@ import org.opencv.android.OpenCVLoader;
import
android.app.Activity
;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android.util.Log
;
public
class
CvNativeActivity
extends
Activity
{
...
...
samples/android/tutorial-1-camerapreview/res/layout/tutorial1_surface_view.xml
浏览文件 @
6d89e1f4
<
Linear
Layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
Frame
Layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:opencv=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
...
...
@@ -20,4 +20,4 @@
opencv:show_fps=
"true"
opencv:camera_id=
"any"
/>
</
Linear
Layout>
</
Frame
Layout>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录