mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #778 from asmorkalov:android_wanr_fix

Browse Source
This commit is contained in:
Andrey Kamaev 2013-04-05 13:00:20 +04:00 committed by OpenCV Buildbot
commit 74e5ff2ec7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/android/native-activity/jni/native.cpp
View File

@ -28,7 +28,7 @@ struct Engine
cv::Ptr<cv::VideoCapture> capture; 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_width = 0;
int frame_height = 0; int frame_height = 0;

2
samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp
View File

@ -8,7 +8,7 @@ using namespace std;
using namespace cv; using namespace cv;
extern "C" { extern "C" {
JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Tuturial2Activity_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba); JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Tutorial2Activity_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba);
JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Tutorial2Activity_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba) JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Tutorial2Activity_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba)
{ {