From 3af92a9d92ae60069b330536329abe03f4995f73 Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Thu, 21 Jun 2012 09:14:14 +0000 Subject: [PATCH] fixing warnings --- modules/java/gen_java.py | 2 ++ modules/java/src/cpp/Mat.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/java/gen_java.py b/modules/java/gen_java.py index 4845584691..55609b5d2d 100644 --- a/modules/java/gen_java.py +++ b/modules/java/gen_java.py @@ -360,6 +360,7 @@ ManualFuncs = { 'cpp_code' : """ // C++: minMaxLoc(Mat src, double* minVal, double* maxVal=0, Point* minLoc=0, Point* maxLoc=0, InputArray mask=noArray()) +JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Core_n_1minMaxLocManual (JNIEnv*, jclass, jlong, jlong); JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Core_n_1minMaxLocManual (JNIEnv* env, jclass, jlong src_nativeObj, jlong mask_nativeObj) @@ -430,6 +431,7 @@ JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Core_n_1minMaxLocManual 'cpp_code' : """ // C++: Size getTextSize(const string& text, int fontFace, double fontScale, int thickness, int* baseLine); +JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Core_n_1getTextSize (JNIEnv*, jclass, jstring, jint, jdouble, jint, jintArray); JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Core_n_1getTextSize (JNIEnv* env, jclass, jstring text, jint fontFace, jdouble fontScale, jint thickness, jintArray baseLine) diff --git a/modules/java/src/cpp/Mat.cpp b/modules/java/src/cpp/Mat.cpp index 80335feb1e..344c38d3c8 100644 --- a/modules/java/src/cpp/Mat.cpp +++ b/modules/java/src/cpp/Mat.cpp @@ -2505,10 +2505,10 @@ JNIEXPORT jint JNICALL Java_org_opencv_core_Mat_nGetD } JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Mat_nGet - (JNIEnv* env, jclass, jlong self, jint row, jint col, jint count); + (JNIEnv* env, jclass, jlong self, jint row, jint col); JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Mat_nGet - (JNIEnv* env, jclass, jlong self, jint row, jint col, jint count) + (JNIEnv* env, jclass, jlong self, jint row, jint col) { try { LOGD("Mat::nGet()");