fixing warnings

pull/2/head
Andrey Pavlenko 13 years ago
parent b065c7a296
commit 3af92a9d92
  1. 2
      modules/java/gen_java.py
  2. 4
      modules/java/src/cpp/Mat.cpp

@ -360,6 +360,7 @@ ManualFuncs = {
'cpp_code' : 'cpp_code' :
""" """
// C++: minMaxLoc(Mat src, double* minVal, double* maxVal=0, Point* minLoc=0, Point* maxLoc=0, InputArray mask=noArray()) // 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 JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Core_n_1minMaxLocManual
(JNIEnv* env, jclass, jlong src_nativeObj, jlong mask_nativeObj) (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' : 'cpp_code' :
""" """
// C++: Size getTextSize(const string& text, int fontFace, double fontScale, int thickness, int* baseLine); // 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 JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Core_n_1getTextSize
(JNIEnv* env, jclass, jstring text, jint fontFace, jdouble fontScale, jint thickness, jintArray baseLine) (JNIEnv* env, jclass, jstring text, jint fontFace, jdouble fontScale, jint thickness, jintArray baseLine)

@ -2505,10 +2505,10 @@ JNIEXPORT jint JNICALL Java_org_opencv_core_Mat_nGetD
} }
JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Mat_nGet 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 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 { try {
LOGD("Mat::nGet()"); LOGD("Mat::nGet()");

Loading…
Cancel
Save