Merge pull request opencv#778 from asmorkalov:android_wanr_fix

Andrey Kamaev · OpenCV Buildbot · commit 74e5ff2ec74a · 2013-04-05T13:00:20.000+04:00
diff --git a/samples/android/native-activity/jni/native.cpp b/samples/android/native-activity/jni/native.cpp
@@ -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;
diff --git a/samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp b/samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp
@@ -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)
 {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ struct Engine`
`28`	`28`	`cv::Ptr<cv::VideoCapture> capture;`
`29`	`29`	`};`
`30`	`30`
`31`		`-cv::Size calc_optimal_camera_resolution(const char* supported, int width, int height)`
	`31`	`+static cv::Size calc_optimal_camera_resolution(const char* supported, int width, int height)`
`32`	`32`	`{`
`33`	`33`	`int frame_width = 0;`
`34`	`34`	`int frame_height = 0;`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ using namespace std;`
`8`	`8`	`using namespace cv;`
`9`	`9`
`10`	`10`	`extern "C" {`
`11`		`-JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Tuturial2Activity_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba);`
	`11`	`+JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Tutorial2Activity_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba);`
`12`	`12`
`13`	`13`	`JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Tutorial2Activity_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba)`
`14`	`14`	`{`