Merge pull request #1138 from janstarzy:mat-dist

pull/1147/merge
Andrey Pavlenko 12 years ago committed by OpenCV Buildbot
commit 6fbda0dfc1
  1. 31
      modules/java/generator/src/cpp/Mat.cpp
  2. 16
      modules/java/generator/src/java/core+Mat.java

@ -523,6 +523,37 @@ JNIEXPORT jlong JNICALL Java_org_opencv_core_Mat_n_1colRange
//
// int Mat::dims()
//
JNIEXPORT jint JNICALL Java_org_opencv_core_Mat_n_1dims
(JNIEnv* env, jclass, jlong self);
JNIEXPORT jint JNICALL Java_org_opencv_core_Mat_n_1dims
(JNIEnv* env, jclass, jlong self)
{
try {
LOGD("Mat::n_1dims()");
Mat* me = (Mat*) self; //TODO: check for NULL
int _retval_ = me->dims;
return _retval_;
} catch(cv::Exception e) {
LOGD("Mat::n_1dims() catched cv::Exception: %s", e.what());
jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, e.what());
return 0;
} catch (...) {
LOGD("Mat::n_1dims() catched unknown exception (...)");
jclass je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, "Unknown exception in JNI code {Mat::n_1dims()}");
return 0;
}
}
// //
// int Mat::cols() // int Mat::cols()
// //

@ -245,6 +245,19 @@ public class Mat {
return retVal; return retVal;
} }
//
// C++: int Mat::dims()
//
// javadoc: Mat::dims()
public int dims()
{
int retVal = n_dims(nativeObj);
return retVal;
}
// //
// C++: int Mat::cols() // C++: int Mat::cols()
// //
@ -1130,6 +1143,9 @@ public class Mat {
// C++: Mat Mat::colRange(int startcol, int endcol) // C++: Mat Mat::colRange(int startcol, int endcol)
private static native long n_colRange(long nativeObj, int startcol, int endcol); private static native long n_colRange(long nativeObj, int startcol, int endcol);
// C++: int Mat::dims()
private static native int n_dims(long nativeObj);
// C++: int Mat::cols() // C++: int Mat::cols()
private static native int n_cols(long nativeObj); private static native int n_cols(long nativeObj);

Loading…
Cancel
Save