Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv
提交
d067dc5a
O
opencv
项目概览
OpenCV
/
opencv
上一次同步 9 个月
通知
992
Star
71100
Fork
55581
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
d067dc5a
编写于
2月 11, 2013
作者:
A
Alexander Smorkalov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Code review notes fixed.
上级
9a2d6f85
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
20 addition
and
20 deletion
+20
-20
samples/android/tutorial-1-camerapreview/AndroidManifest.xml
samples/android/tutorial-1-camerapreview/AndroidManifest.xml
+1
-1
samples/android/tutorial-1-camerapreview/res/values/strings.xml
...s/android/tutorial-1-camerapreview/res/values/strings.xml
+1
-1
samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Tutorial1Activity.java
...w/src/org/opencv/samples/tutorial1/Tutorial1Activity.java
+2
-2
samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml
...es/android/tutorial-2-mixedprocessing/AndroidManifest.xml
+1
-1
samples/android/tutorial-2-mixedprocessing/CMakeLists.txt
samples/android/tutorial-2-mixedprocessing/CMakeLists.txt
+1
-1
samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp
samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp
+2
-2
samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Tutorial2Activity.java
...g/src/org/opencv/samples/tutorial2/Tutorial2Activity.java
+2
-2
samples/android/tutorial-3-cameracontrol/AndroidManifest.xml
samples/android/tutorial-3-cameracontrol/AndroidManifest.xml
+1
-1
samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml
...ial-3-cameracontrol/res/layout/tutorial3_surface_view.xml
+1
-1
samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3Activity.java
...l/src/org/opencv/samples/tutorial3/Tutorial3Activity.java
+5
-5
samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java
...ntrol/src/org/opencv/samples/tutorial3/Tutorial3View.java
+3
-3
未找到文件。
samples/android/tutorial-1-camerapreview/AndroidManifest.xml
浏览文件 @
d067dc5a
...
...
@@ -9,7 +9,7 @@
android:icon=
"@drawable/icon"
android:theme=
"@android:style/Theme.NoTitleBar.Fullscreen"
>
<activity
android:name=
"
Sample1CameraPreview
"
<activity
android:name=
"
Tutorial1Activity
"
android:label=
"@string/app_name"
android:screenOrientation=
"landscape"
android:configChanges=
"keyboardHidden|orientation"
>
...
...
samples/android/tutorial-1-camerapreview/res/values/strings.xml
浏览文件 @
d067dc5a
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string
name=
"app_name"
>
OCV T1
Camera
Preview
</string>
<string
name=
"app_name"
>
OCV T1 Preview
</string>
</resources>
samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/
Sample1Java
.java
→
samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/
Tutorial1Activity
.java
浏览文件 @
d067dc5a
...
...
@@ -17,7 +17,7 @@ import android.view.SurfaceView;
import
android.view.WindowManager
;
import
android.widget.Toast
;
public
class
Sample1Java
extends
Activity
implements
CvCameraViewListener2
{
public
class
Tutorial1Activity
extends
Activity
implements
CvCameraViewListener2
{
private
static
final
String
TAG
=
"OCVSample::Activity"
;
private
CameraBridgeViewBase
mOpenCvCameraView
;
...
...
@@ -41,7 +41,7 @@ public class Sample1Java extends Activity implements CvCameraViewListener2 {
}
};
public
Sample1Java
()
{
public
Tutorial1Activity
()
{
Log
.
i
(
TAG
,
"Instantiated new "
+
this
.
getClass
());
}
...
...
samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml
浏览文件 @
d067dc5a
...
...
@@ -9,7 +9,7 @@
android:icon=
"@drawable/icon"
android:theme=
"@android:style/Theme.NoTitleBar.Fullscreen"
>
<activity
android:name=
"
Sample2MixedProcessing
"
<activity
android:name=
"
Tutorial2Activity
"
android:label=
"@string/app_name"
android:screenOrientation=
"landscape"
android:configChanges=
"keyboardHidden|orientation"
>
...
...
samples/android/tutorial-2-mixedprocessing/CMakeLists.txt
浏览文件 @
d067dc5a
set
(
sample example-tutorial-2-
native
processing
)
set
(
sample example-tutorial-2-
mixed
processing
)
if
(
BUILD_FAT_JAVA_LIB
)
set
(
native_deps opencv_java
)
...
...
samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp
浏览文件 @
d067dc5a
...
...
@@ -8,9 +8,9 @@ using namespace std;
using
namespace
cv
;
extern
"C"
{
JNIEXPORT
void
JNICALL
Java_org_opencv_samples_tutorial2_
Sample2NativeProcessing
_FindFeatures
(
JNIEnv
*
,
jobject
,
jlong
addrGray
,
jlong
addrRgba
);
JNIEXPORT
void
JNICALL
Java_org_opencv_samples_tutorial2_
Tuturial2Activity
_FindFeatures
(
JNIEnv
*
,
jobject
,
jlong
addrGray
,
jlong
addrRgba
);
JNIEXPORT
void
JNICALL
Java_org_opencv_samples_tutorial2_
Sample2NativeProcessing
_FindFeatures
(
JNIEnv
*
,
jobject
,
jlong
addrGray
,
jlong
addrRgba
)
JNIEXPORT
void
JNICALL
Java_org_opencv_samples_tutorial2_
Tutorial2Activity
_FindFeatures
(
JNIEnv
*
,
jobject
,
jlong
addrGray
,
jlong
addrRgba
)
{
Mat
&
mGr
=
*
(
Mat
*
)
addrGray
;
Mat
&
mRgb
=
*
(
Mat
*
)
addrRgba
;
...
...
samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/
Sample2MixedProcessing
.java
→
samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/
Tutorial2Activity
.java
浏览文件 @
d067dc5a
...
...
@@ -17,7 +17,7 @@ import android.view.Menu;
import
android.view.MenuItem
;
import
android.view.WindowManager
;
public
class
Sample2MixedProcessing
extends
Activity
implements
CvCameraViewListener2
{
public
class
Tutorial2Activity
extends
Activity
implements
CvCameraViewListener2
{
private
static
final
String
TAG
=
"OCVSample::Activity"
;
private
static
final
int
VIEW_MODE_RGBA
=
0
;
...
...
@@ -58,7 +58,7 @@ public class Sample2MixedProcessing extends Activity implements CvCameraViewList
}
};
public
Sample2MixedProcessing
()
{
public
Tutorial2Activity
()
{
Log
.
i
(
TAG
,
"Instantiated new "
+
this
.
getClass
());
}
...
...
samples/android/tutorial-3-cameracontrol/AndroidManifest.xml
浏览文件 @
d067dc5a
...
...
@@ -9,7 +9,7 @@
android:icon=
"@drawable/icon"
android:theme=
"@android:style/Theme.NoTitleBar.Fullscreen"
>
<activity
android:name=
"
Sample3CameraControl
"
<activity
android:name=
"
Tutorial3Activity
"
android:label=
"@string/app_name"
android:screenOrientation=
"landscape"
android:configChanges=
"keyboardHidden|orientation"
>
...
...
samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml
浏览文件 @
d067dc5a
...
...
@@ -3,7 +3,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<org.opencv.samples.tutorial
5.SampleJavaCamera
View
<org.opencv.samples.tutorial
3.Tutorial3
View
android:layout_width=
"fill_parent"
android:layout_height=
"fill_parent"
android:visibility=
"gone"
...
...
samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/
Sample3CameraControl
.java
→
samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/
Tutorial3Activity
.java
浏览文件 @
d067dc5a
...
...
@@ -28,10 +28,10 @@ import android.view.View.OnTouchListener;
import
android.view.WindowManager
;
import
android.widget.Toast
;
public
class
Sample3CameraControl
extends
Activity
implements
CvCameraViewListener2
,
OnTouchListener
{
public
class
Tutorial3Activity
extends
Activity
implements
CvCameraViewListener2
,
OnTouchListener
{
private
static
final
String
TAG
=
"OCVSample::Activity"
;
private
SampleJavaCamera
View
mOpenCvCameraView
;
private
Tutorial3
View
mOpenCvCameraView
;
private
List
<
Size
>
mResolutionList
;
private
MenuItem
[]
mEffectMenuItems
;
private
SubMenu
mColorEffectsMenu
;
...
...
@@ -46,7 +46,7 @@ public class Sample3CameraControl extends Activity implements CvCameraViewListen
{
Log
.
i
(
TAG
,
"OpenCV loaded successfully"
);
mOpenCvCameraView
.
enableView
();
mOpenCvCameraView
.
setOnTouchListener
(
Sample3CameraControl
.
this
);
mOpenCvCameraView
.
setOnTouchListener
(
Tutorial3Activity
.
this
);
}
break
;
default
:
{
...
...
@@ -56,7 +56,7 @@ public class Sample3CameraControl extends Activity implements CvCameraViewListen
}
};
public
Sample3CameraControl
()
{
public
Tutorial3Activity
()
{
Log
.
i
(
TAG
,
"Instantiated new "
+
this
.
getClass
());
}
...
...
@@ -69,7 +69,7 @@ public class Sample3CameraControl extends Activity implements CvCameraViewListen
setContentView
(
R
.
layout
.
tutorial3_surface_view
);
mOpenCvCameraView
=
(
SampleJavaCamera
View
)
findViewById
(
R
.
id
.
tutorial3_activity_java_surface_view
);
mOpenCvCameraView
=
(
Tutorial3
View
)
findViewById
(
R
.
id
.
tutorial3_activity_java_surface_view
);
mOpenCvCameraView
.
setVisibility
(
SurfaceView
.
VISIBLE
);
...
...
samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/
SampleJavaCamera
View.java
→
samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/
Tutorial3
View.java
浏览文件 @
d067dc5a
...
...
@@ -14,11 +14,11 @@ import android.hardware.Camera.Size;
import
android.util.AttributeSet
;
import
android.util.Log
;
public
class
SampleJavaCamera
View
extends
JavaCameraView
{
public
class
Tutorial3
View
extends
JavaCameraView
{
private
static
final
String
TAG
=
"Sample::
SampleJavaCamera
View"
;
private
static
final
String
TAG
=
"Sample::
Tutorial3
View"
;
public
SampleJavaCamera
View
(
Context
context
,
AttributeSet
attrs
)
{
public
Tutorial3
View
(
Context
context
,
AttributeSet
attrs
)
{
super
(
context
,
attrs
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录