Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
8c40f0cc
Commit
8c40f0cc
authored
Apr 16, 2013
by
Andrey Pavlenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing build and lint warnings
parent
c02095ae
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
14 deletions
+9
-14
lint.xml
modules/java/android_lib/lint.xml
+3
-0
android+CameraBridgeViewBase.java
...java/generator/src/java/android+CameraBridgeViewBase.java
+1
-2
android+JavaCameraView.java
modules/java/generator/src/java/android+JavaCameraView.java
+0
-3
android+NativeCameraView.java
...les/java/generator/src/java/android+NativeCameraView.java
+3
-6
CvNativeActivity.java
...c/org/opencv/samples/NativeActivity/CvNativeActivity.java
+0
-1
tutorial1_surface_view.xml
...ial-1-camerapreview/res/layout/tutorial1_surface_view.xml
+2
-2
No files found.
modules/java/android_lib/lint.xml
View file @
8c40f0cc
<?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
View file @
8c40f0cc
...
...
@@ -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
View file @
8c40f0cc
...
...
@@ -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
View file @
8c40f0cc
...
...
@@ -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
View file @
8c40f0cc
...
...
@@ -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
View file @
8c40f0cc
<
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>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment