diff --git a/samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp b/samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp index 2ade0ca981232b444daaec4fbd6a2f510c141dac..22eda9ec11d3d3f6a6aed41b78a3965b073e92ba 100644 --- a/samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp +++ b/samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp @@ -33,9 +33,9 @@ JNIEXPORT jlong JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker DetectorParams.minObjectSize = faceSize; result = (jlong)new DetectionBasedTracker(stdFileName, DetectorParams); } - catch(cv::Exception e) + catch(cv::Exception& e) { - LOGD("nativeCreateObject catched cv::Exception: %s", e.what()); + LOGD("nativeCreateObject caught cv::Exception: %s", e.what()); jclass je = jenv->FindClass("org/opencv/core/CvException"); if(!je) je = jenv->FindClass("java/lang/Exception"); @@ -43,7 +43,7 @@ JNIEXPORT jlong JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker } catch (...) { - LOGD("nativeCreateObject catched unknown exception"); + LOGD("nativeCreateObject caught unknown exception"); jclass je = jenv->FindClass("java/lang/Exception"); jenv->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1VideoCapture__()}"); return 0; @@ -65,9 +65,9 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_ delete (DetectionBasedTracker*)thiz; } } - catch(cv::Exception e) + catch(cv::Exception& e) { - LOGD("nativeestroyObject catched cv::Exception: %s", e.what()); + LOGD("nativeestroyObject caught cv::Exception: %s", e.what()); jclass je = jenv->FindClass("org/opencv/core/CvException"); if(!je) je = jenv->FindClass("java/lang/Exception"); @@ -75,7 +75,7 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_ } catch (...) { - LOGD("nativeDestroyObject catched unknown exception"); + LOGD("nativeDestroyObject caught unknown exception"); jclass je = jenv->FindClass("java/lang/Exception"); jenv->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1VideoCapture__()}"); } @@ -90,9 +90,9 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_ { ((DetectionBasedTracker*)thiz)->run(); } - catch(cv::Exception e) + catch(cv::Exception& e) { - LOGD("nativeStart catched cv::Exception: %s", e.what()); + LOGD("nativeStart caught cv::Exception: %s", e.what()); jclass je = jenv->FindClass("org/opencv/core/CvException"); if(!je) je = jenv->FindClass("java/lang/Exception"); @@ -100,7 +100,7 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_ } catch (...) { - LOGD("nativeStart catched unknown exception"); + LOGD("nativeStart caught unknown exception"); jclass je = jenv->FindClass("java/lang/Exception"); jenv->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1VideoCapture__()}"); } @@ -115,9 +115,9 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_ { ((DetectionBasedTracker*)thiz)->stop(); } - catch(cv::Exception e) + catch(cv::Exception& e) { - LOGD("nativeStop catched cv::Exception: %s", e.what()); + LOGD("nativeStop caught cv::Exception: %s", e.what()); jclass je = jenv->FindClass("org/opencv/core/CvException"); if(!je) je = jenv->FindClass("java/lang/Exception"); @@ -125,7 +125,7 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_ } catch (...) { - LOGD("nativeStop catched unknown exception"); + LOGD("nativeStop caught unknown exception"); jclass je = jenv->FindClass("java/lang/Exception"); jenv->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1VideoCapture__()}"); } @@ -146,9 +146,9 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_ ((DetectionBasedTracker*)thiz)->setParameters(DetectorParams); } } - catch(cv::Exception e) + catch(cv::Exception& e) { - LOGD("nativeStop catched cv::Exception: %s", e.what()); + LOGD("nativeStop caught cv::Exception: %s", e.what()); jclass je = jenv->FindClass("org/opencv/core/CvException"); if(!je) je = jenv->FindClass("java/lang/Exception"); @@ -156,7 +156,7 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_ } catch (...) { - LOGD("nativeSetFaceSize catched unknown exception"); + LOGD("nativeSetFaceSize caught unknown exception"); jclass je = jenv->FindClass("java/lang/Exception"); jenv->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1VideoCapture__()}"); } @@ -175,9 +175,9 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_ ((DetectionBasedTracker*)thiz)->getObjects(RectFaces); vector_Rect_to_Mat(RectFaces, *((Mat*)faces)); } - catch(cv::Exception e) + catch(cv::Exception& e) { - LOGD("nativeCreateObject catched cv::Exception: %s", e.what()); + LOGD("nativeCreateObject caught cv::Exception: %s", e.what()); jclass je = jenv->FindClass("org/opencv/core/CvException"); if(!je) je = jenv->FindClass("java/lang/Exception"); @@ -185,7 +185,7 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_ } catch (...) { - LOGD("nativeDetect catched unknown exception"); + LOGD("nativeDetect caught unknown exception"); jclass je = jenv->FindClass("java/lang/Exception"); jenv->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1VideoCapture__()}"); } diff --git a/samples/android/tutorial-3-native/jni/jni_part.cpp b/samples/android/tutorial-3-native/jni/jni_part.cpp index fa3c857ab093c41d64e8d0c3c004022f2c7c5f78..aa9acac4948d4a61bad20b6cbdba7a01c7eff910 100644 --- a/samples/android/tutorial-3-native/jni/jni_part.cpp +++ b/samples/android/tutorial-3-native/jni/jni_part.cpp @@ -12,14 +12,16 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial3_Sample3Native_FindFeatu JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial3_Sample3Native_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba) { - Mat* pMatGr=(Mat*)addrGray; - Mat* pMatRgb=(Mat*)addrRgba; + Mat& mGr = *(Mat*)addrGray; + Mat& mRgb = *(Mat*)addrRgba; vector v; FastFeatureDetector detector(50); - detector.detect(*pMatGr, v); - for( size_t i = 0; i < v.size(); i++ ) - circle(*pMatRgb, Point(v[i].pt.x, v[i].pt.y), 10, Scalar(255,0,0,255)); + detector.detect(mGr, v); + for( unsigned int i = 0; i < v.size(); i++ ) + { + const KeyPoint& kp = v[i]; + circle(mRgb, Point(kp.pt.x, kp.pt.y), 10, Scalar(255,0,0,255)); + } } - } diff --git a/samples/android/tutorial-4-mixed/jni/jni_part.cpp b/samples/android/tutorial-4-mixed/jni/jni_part.cpp index 0c395d629d940a63bf90f998a5dc7dd8d3a007c6..957eda12f8cb2394f8df81b30c1efdb5ae1d1c6b 100644 --- a/samples/android/tutorial-4-mixed/jni/jni_part.cpp +++ b/samples/android/tutorial-4-mixed/jni/jni_part.cpp @@ -12,14 +12,16 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial4_Sample4Mixed_FindFeatur JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial4_Sample4Mixed_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba) { - Mat* pMatGr=(Mat*)addrGray; - Mat* pMatRgb=(Mat*)addrRgba; + Mat& mGr = *(Mat*)addrGray; + Mat& mRgb = *(Mat*)addrRgba; vector v; FastFeatureDetector detector(50); - detector.detect(*pMatGr, v); - for( size_t i = 0; i < v.size(); i++ ) - circle(*pMatRgb, Point(v[i].pt.x, v[i].pt.y), 10, Scalar(255,0,0,255)); + detector.detect(mGr, v); + for( unsigned int i = 0; i < v.size(); i++ ) + { + const KeyPoint& kp = v[i]; + circle(mRgb, Point(kp.pt.x, kp.pt.y), 10, Scalar(255,0,0,255)); + } } - }