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
74e5ff2e
Commit
74e5ff2e
authored
Apr 05, 2013
by
Andrey Kamaev
Committed by
OpenCV Buildbot
Apr 05, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #778 from asmorkalov:android_wanr_fix
parents
72e49dc7
f89cc191
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
native.cpp
samples/android/native-activity/jni/native.cpp
+1
-1
jni_part.cpp
samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp
+1
-1
No files found.
samples/android/native-activity/jni/native.cpp
View file @
74e5ff2e
...
...
@@ -28,7 +28,7 @@ struct Engine
cv
::
Ptr
<
cv
::
VideoCapture
>
capture
;
};
cv
::
Size
calc_optimal_camera_resolution
(
const
char
*
supported
,
int
width
,
int
height
)
static
cv
::
Size
calc_optimal_camera_resolution
(
const
char
*
supported
,
int
width
,
int
height
)
{
int
frame_width
=
0
;
int
frame_height
=
0
;
...
...
samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp
View file @
74e5ff2e
...
...
@@ -8,7 +8,7 @@ using namespace std;
using
namespace
cv
;
extern
"C"
{
JNIEXPORT
void
JNICALL
Java_org_opencv_samples_tutorial2_Tut
u
rial2Activity_FindFeatures
(
JNIEnv
*
,
jobject
,
jlong
addrGray
,
jlong
addrRgba
);
JNIEXPORT
void
JNICALL
Java_org_opencv_samples_tutorial2_Tut
o
rial2Activity_FindFeatures
(
JNIEnv
*
,
jobject
,
jlong
addrGray
,
jlong
addrRgba
);
JNIEXPORT
void
JNICALL
Java_org_opencv_samples_tutorial2_Tutorial2Activity_FindFeatures
(
JNIEnv
*
,
jobject
,
jlong
addrGray
,
jlong
addrRgba
)
{
...
...
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