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
7ca50b2b
Commit
7ca50b2b
authored
Jul 12, 2011
by
Andrey Pavlenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
org.opencv.utils renamed to org.opencv.android
parent
bc9a9b71
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
android.cpp
modules/java/src/cpp/android.cpp
+4
-4
android.java
modules/java/src/java/android.java
+1
-1
Sample1View.java
...android/1-java/src/org/opencv/samples/s1/Sample1View.java
+2
-2
Sample4View.java
...ndroid/4-mixed/src/org/opencv/samples/s4/Sample4View.java
+2
-2
No files found.
modules/java/src/cpp/
utils
.cpp
→
modules/java/src/cpp/
android
.cpp
View file @
7ca50b2b
...
...
@@ -9,12 +9,12 @@ extern "C" {
#endif
/*
* Class: org_opencv_
utils
* Class: org_opencv_
android
* Method: nBitmapToMat(Bitmap b)
* Signature: (L)J
*/
JNIEXPORT
jlong
JNICALL
Java_org_opencv_
utils
_nBitmapToMat
JNIEXPORT
jlong
JNICALL
Java_org_opencv_
android
_nBitmapToMat
(
JNIEnv
*
env
,
jclass
cls
,
jobject
bitmap
)
{
AndroidBitmapInfo
info
;
...
...
@@ -40,11 +40,11 @@ JNIEXPORT jlong JNICALL Java_org_opencv_utils_nBitmapToMat
}
/*
* Class: org_opencv_
utils
* Class: org_opencv_
android
* Method: nBitmapToMat(long m, Bitmap b)
* Signature: (JL)Z
*/
JNIEXPORT
jboolean
JNICALL
Java_org_opencv_
utils
_nMatToBitmap
JNIEXPORT
jboolean
JNICALL
Java_org_opencv_
android
_nMatToBitmap
(
JNIEnv
*
env
,
jclass
cls
,
jlong
m
,
jobject
bitmap
)
{
AndroidBitmapInfo
info
;
...
...
modules/java/src/java/
utils
.java
→
modules/java/src/java/
android
.java
View file @
7ca50b2b
...
...
@@ -2,7 +2,7 @@ package org.opencv;
import
android.graphics.Bitmap
;
public
class
utils
{
public
class
android
{
public
static
Mat
BitmapToMat
(
Bitmap
b
)
{
return
new
Mat
(
nBitmapToMat
(
b
)
);
...
...
samples/android/1-java/src/org/opencv/samples/s1/Sample1View.java
View file @
7ca50b2b
...
...
@@ -16,7 +16,7 @@ import org.opencv.Scalar;
import
org.opencv.Size
;
import
org.opencv.core
;
import
org.opencv.imgproc
;
import
org.opencv.
utils
;
import
org.opencv.
android
;
import
java.util.List
;
...
...
@@ -163,7 +163,7 @@ class Sample1View extends SurfaceView implements SurfaceHolder.Callback, Runnabl
}
Bitmap
bmp
=
Bitmap
.
createBitmap
(
mFrameWidth
,
mFrameHeight
,
Bitmap
.
Config
.
ARGB_8888
);
utils
.
MatToBitmap
(
mRgba
,
bmp
);
android
.
MatToBitmap
(
mRgba
,
bmp
);
Canvas
canvas
=
mHolder
.
lockCanvas
();
canvas
.
drawBitmap
(
bmp
,
(
canvas
.
getWidth
()-
mFrameWidth
)/
2
,
(
canvas
.
getHeight
()-
mFrameHeight
)/
2
,
null
);
...
...
samples/android/4-mixed/src/org/opencv/samples/s4/Sample4View.java
View file @
7ca50b2b
...
...
@@ -14,7 +14,7 @@ import org.opencv.Mat;
import
org.opencv.Size
;
import
org.opencv.core
;
import
org.opencv.imgproc
;
import
org.opencv.
utils
;
import
org.opencv.
android
;
import
java.util.List
;
...
...
@@ -164,7 +164,7 @@ class Sample4View extends SurfaceView implements SurfaceHolder.Callback, Runnabl
}
Bitmap
bmp
=
Bitmap
.
createBitmap
(
mFrameWidth
,
mFrameHeight
,
Bitmap
.
Config
.
ARGB_8888
);
utils
.
MatToBitmap
(
mRgba
,
bmp
);
android
.
MatToBitmap
(
mRgba
,
bmp
);
Canvas
canvas
=
mHolder
.
lockCanvas
();
canvas
.
drawBitmap
(
bmp
,
(
canvas
.
getWidth
()-
mFrameWidth
)/
2
,
(
canvas
.
getHeight
()-
mFrameHeight
)/
2
,
null
);
...
...
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