Waning fixes for Android samples
authorAlexander Smorkalov <alexander.smorkalov@itseez.com>
Fri, 5 Apr 2013 08:17:45 +0000 (12:17 +0400)
committerAlexander Smorkalov <alexander.smorkalov@itseez.com>
Fri, 5 Apr 2013 08:17:45 +0000 (12:17 +0400)
samples/android/native-activity/jni/native.cpp
samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp

index 38dda06..66bc006 100644 (file)
@@ -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;
index e7ed75d..f8e3ada 100644 (file)
@@ -8,7 +8,7 @@ using namespace std;
 using namespace cv;
 
 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)
 {