提交 74e5ff2e 编写于 作者: A Andrey Kamaev 提交者: OpenCV Buildbot

Merge pull request #778 from asmorkalov:android_wanr_fix

...@@ -28,7 +28,7 @@ struct Engine ...@@ -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;
......
...@@ -8,7 +8,7 @@ using namespace std; ...@@ -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)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册