Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed build errors in java bindings on desktop in Debug mode

Browse Source
pull/33/head
Vadim Pisarevsky 13 years ago
parent 4df537bc1c
commit b2bf90e951
2 changed files with 35 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 108
      modules/java/generator/src/cpp/VideoCapture.cpp
  2. 2
      modules/java/generator/src/cpp/converters.cpp

108
modules/java/generator/src/cpp/VideoCapture.cpp
Unescape View File

@ -1,10 +1,12 @@
#include <jni.h> #include <jni.h>
#ifdef DEBUG #if defined DEBUG && defined ANDROID
#include <android/log.h> #include <android/log.h>
#define MODULE_LOG_TAG "OpenCV.highgui" #define MODULE_LOG_TAG "OpenCV.highgui"
#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, MODULE_LOG_TAG, __VA_ARGS__)) #define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, MODULE_LOG_TAG, __VA_ARGS__))
#endif // DEBUG #else
#define LOGD(...)
#endif
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_HIGHGUI #ifdef HAVE_OPENCV_HIGHGUI
@ -27,25 +29,19 @@ JNIEXPORT jlong JNICALL Java_org_opencv_highgui_VideoCapture_n_1VideoCapture__
(JNIEnv* env, jclass) (JNIEnv* env, jclass)
{ {
try { try {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1VideoCapture__()"); LOGD("highgui::VideoCapture_n_1VideoCapture__()");
#endif // DEBUG
VideoCapture* _retval_ = new VideoCapture( ); VideoCapture* _retval_ = new VideoCapture( );
return (jlong) _retval_; return (jlong) _retval_;
} catch(cv::Exception e) { } catch(cv::Exception e) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1VideoCapture__() catched cv::Exception: %s", e.what()); LOGD("highgui::VideoCapture_n_1VideoCapture__() catched cv::Exception: %s", e.what());
#endif // DEBUG
jclass je = env->FindClass("org/opencv/core/CvException"); jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception"); if(!je) je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, e.what()); env->ThrowNew(je, e.what());
return 0; return 0;
} catch (...) { } catch (...) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1VideoCapture__() catched unknown exception (...)"); LOGD("highgui::VideoCapture_n_1VideoCapture__() catched unknown exception (...)");
#endif // DEBUG
jclass je = env->FindClass("java/lang/Exception"); jclass je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1VideoCapture__()}"); env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1VideoCapture__()}");
return 0; return 0;
@ -64,25 +60,19 @@ JNIEXPORT jlong JNICALL Java_org_opencv_highgui_VideoCapture_n_1VideoCapture__I
(JNIEnv* env, jclass, jint device) (JNIEnv* env, jclass, jint device)
{ {
try { try {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1VideoCapture__I()"); LOGD("highgui::VideoCapture_n_1VideoCapture__I()");
#endif // DEBUG
VideoCapture* _retval_ = new VideoCapture( device ); VideoCapture* _retval_ = new VideoCapture( device );
return (jlong) _retval_; return (jlong) _retval_;
} catch(cv::Exception e) { } catch(cv::Exception e) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1VideoCapture__I() catched cv::Exception: %s", e.what()); LOGD("highgui::VideoCapture_n_1VideoCapture__I() catched cv::Exception: %s", e.what());
#endif // DEBUG
jclass je = env->FindClass("org/opencv/core/CvException"); jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception"); if(!je) je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, e.what()); env->ThrowNew(je, e.what());
return 0; return 0;
} catch (...) { } catch (...) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1VideoCapture__I() catched unknown exception (...)"); LOGD("highgui::VideoCapture_n_1VideoCapture__I() catched unknown exception (...)");
#endif // DEBUG
jclass je = env->FindClass("java/lang/Exception"); jclass je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1VideoCapture__I()}"); env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1VideoCapture__I()}");
return 0; return 0;
@ -102,25 +92,19 @@ JNIEXPORT jdouble JNICALL Java_org_opencv_highgui_VideoCapture_n_1get
(JNIEnv* env, jclass, jlong self, jint propId) (JNIEnv* env, jclass, jlong self, jint propId)
{ {
try { try {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1get()"); LOGD("highgui::VideoCapture_n_1get()");
#endif // DEBUG
VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL
double _retval_ = me->get( propId ); double _retval_ = me->get( propId );
return _retval_; return _retval_;
} catch(cv::Exception e) { } catch(cv::Exception e) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1get() catched cv::Exception: %s", e.what()); LOGD("highgui::VideoCapture_n_1get() catched cv::Exception: %s", e.what());
#endif // DEBUG
jclass je = env->FindClass("org/opencv/core/CvException"); jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception"); if(!je) je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, e.what()); env->ThrowNew(je, e.what());
return 0; return 0;
} catch (...) { } catch (...) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1get() catched unknown exception (...)"); LOGD("highgui::VideoCapture_n_1get() catched unknown exception (...)");
#endif // DEBUG
jclass je = env->FindClass("java/lang/Exception"); jclass je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1get()}"); env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1get()}");
return 0; return 0;
@ -140,25 +124,19 @@ JNIEXPORT jboolean JNICALL Java_org_opencv_highgui_VideoCapture_n_1grab
(JNIEnv* env, jclass, jlong self) (JNIEnv* env, jclass, jlong self)
{ {
try { try {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1grab()"); LOGD("highgui::VideoCapture_n_1grab()");
#endif // DEBUG
VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL
bool _retval_ = me->grab( ); bool _retval_ = me->grab( );
return _retval_; return _retval_;
} catch(cv::Exception e) { } catch(cv::Exception e) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1grab() catched cv::Exception: %s", e.what()); LOGD("highgui::VideoCapture_n_1grab() catched cv::Exception: %s", e.what());
#endif // DEBUG
jclass je = env->FindClass("org/opencv/core/CvException"); jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception"); if(!je) je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, e.what()); env->ThrowNew(je, e.what());
return 0; return 0;
} catch (...) { } catch (...) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1grab() catched unknown exception (...)"); LOGD("highgui::VideoCapture_n_1grab() catched unknown exception (...)");
#endif // DEBUG
jclass je = env->FindClass("java/lang/Exception"); jclass je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1grab()}"); env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1grab()}");
return 0; return 0;
@ -178,25 +156,19 @@ JNIEXPORT jboolean JNICALL Java_org_opencv_highgui_VideoCapture_n_1isOpened
(JNIEnv* env, jclass, jlong self) (JNIEnv* env, jclass, jlong self)
{ {
try { try {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1isOpened()"); LOGD("highgui::VideoCapture_n_1isOpened()");
#endif // DEBUG
VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL
bool _retval_ = me->isOpened( ); bool _retval_ = me->isOpened( );
return _retval_; return _retval_;
} catch(cv::Exception e) { } catch(cv::Exception e) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1isOpened() catched cv::Exception: %s", e.what()); LOGD("highgui::VideoCapture_n_1isOpened() catched cv::Exception: %s", e.what());
#endif // DEBUG
jclass je = env->FindClass("org/opencv/core/CvException"); jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception"); if(!je) je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, e.what()); env->ThrowNew(je, e.what());
return 0; return 0;
} catch (...) { } catch (...) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1isOpened() catched unknown exception (...)"); LOGD("highgui::VideoCapture_n_1isOpened() catched unknown exception (...)");
#endif // DEBUG
jclass je = env->FindClass("java/lang/Exception"); jclass je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1isOpened()}"); env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1isOpened()}");
return 0; return 0;
@ -215,25 +187,19 @@ JNIEXPORT jboolean JNICALL Java_org_opencv_highgui_VideoCapture_n_1open__JI
(JNIEnv* env, jclass, jlong self, jint device) (JNIEnv* env, jclass, jlong self, jint device)
{ {
try { try {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1open__JI()"); LOGD("highgui::VideoCapture_n_1open__JI()");
#endif // DEBUG
VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL
bool _retval_ = me->open( device ); bool _retval_ = me->open( device );
return _retval_; return _retval_;
} catch(cv::Exception e) { } catch(cv::Exception e) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1open__JI() catched cv::Exception: %s", e.what()); LOGD("highgui::VideoCapture_n_1open__JI() catched cv::Exception: %s", e.what());
#endif // DEBUG
jclass je = env->FindClass("org/opencv/core/CvException"); jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception"); if(!je) je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, e.what()); env->ThrowNew(je, e.what());
return 0; return 0;
} catch (...) { } catch (...) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1open__JI() catched unknown exception (...)"); LOGD("highgui::VideoCapture_n_1open__JI() catched unknown exception (...)");
#endif // DEBUG
jclass je = env->FindClass("java/lang/Exception"); jclass je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1open__JI()}"); env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1open__JI()}");
return 0; return 0;
@ -253,26 +219,20 @@ JNIEXPORT jboolean JNICALL Java_org_opencv_highgui_VideoCapture_n_1read
(JNIEnv* env, jclass, jlong self, jlong image_nativeObj) (JNIEnv* env, jclass, jlong self, jlong image_nativeObj)
{ {
try { try {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1read()"); LOGD("highgui::VideoCapture_n_1read()");
#endif // DEBUG
VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL
Mat& image = *((Mat*)image_nativeObj); Mat& image = *((Mat*)image_nativeObj);
bool _retval_ = me->read( image ); bool _retval_ = me->read( image );
return _retval_; return _retval_;
} catch(cv::Exception e) { } catch(cv::Exception e) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1read() catched cv::Exception: %s", e.what()); LOGD("highgui::VideoCapture_n_1read() catched cv::Exception: %s", e.what());
#endif // DEBUG
jclass je = env->FindClass("org/opencv/core/CvException"); jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception"); if(!je) je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, e.what()); env->ThrowNew(je, e.what());
return 0; return 0;
} catch (...) { } catch (...) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1read() catched unknown exception (...)"); LOGD("highgui::VideoCapture_n_1read() catched unknown exception (...)");
#endif // DEBUG
jclass je = env->FindClass("java/lang/Exception"); jclass je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1read()}"); env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1read()}");
return 0; return 0;
@ -292,25 +252,25 @@ JNIEXPORT void JNICALL Java_org_opencv_highgui_VideoCapture_n_1release
(JNIEnv* env, jclass, jlong self) (JNIEnv* env, jclass, jlong self)
{ {
try { try {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1release()"); LOGD("highgui::VideoCapture_n_1release()");
#endif // DEBUG
VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL
me->release( ); me->release( );
return; return;
} catch(cv::Exception e) { } catch(cv::Exception e) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1release() catched cv::Exception: %s", e.what()); LOGD("highgui::VideoCapture_n_1release() catched cv::Exception: %s", e.what());
#endif // DEBUG
jclass je = env->FindClass("org/opencv/core/CvException"); jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception"); if(!je) je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, e.what()); env->ThrowNew(je, e.what());
return; return;
} catch (...) { } catch (...) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1release() catched unknown exception (...)"); LOGD("highgui::VideoCapture_n_1release() catched unknown exception (...)");
#endif // DEBUG
jclass je = env->FindClass("java/lang/Exception"); jclass je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1release()}"); env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1release()}");
return; return;
@ -330,26 +290,26 @@ JNIEXPORT jboolean JNICALL Java_org_opencv_highgui_VideoCapture_n_1retrieve__JJI
(JNIEnv* env, jclass, jlong self, jlong image_nativeObj, jint channel) (JNIEnv* env, jclass, jlong self, jlong image_nativeObj, jint channel)
{ {
try { try {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1retrieve__JJI()"); LOGD("highgui::VideoCapture_n_1retrieve__JJI()");
#endif // DEBUG
VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL
Mat& image = *((Mat*)image_nativeObj); Mat& image = *((Mat*)image_nativeObj);
bool _retval_ = me->retrieve( image, channel ); bool _retval_ = me->retrieve( image, channel );
return _retval_; return _retval_;
} catch(cv::Exception e) { } catch(cv::Exception e) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1retrieve__JJI() catched cv::Exception: %s", e.what()); LOGD("highgui::VideoCapture_n_1retrieve__JJI() catched cv::Exception: %s", e.what());
#endif // DEBUG
jclass je = env->FindClass("org/opencv/core/CvException"); jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception"); if(!je) je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, e.what()); env->ThrowNew(je, e.what());
return 0; return 0;
} catch (...) { } catch (...) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1retrieve__JJI() catched unknown exception (...)"); LOGD("highgui::VideoCapture_n_1retrieve__JJI() catched unknown exception (...)");
#endif // DEBUG
jclass je = env->FindClass("java/lang/Exception"); jclass je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1retrieve__JJI()}"); env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1retrieve__JJI()}");
return 0; return 0;
@ -365,26 +325,26 @@ JNIEXPORT jboolean JNICALL Java_org_opencv_highgui_VideoCapture_n_1retrieve__JJ
(JNIEnv* env, jclass, jlong self, jlong image_nativeObj) (JNIEnv* env, jclass, jlong self, jlong image_nativeObj)
{ {
try { try {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1retrieve__JJ()"); LOGD("highgui::VideoCapture_n_1retrieve__JJ()");
#endif // DEBUG
VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL
Mat& image = *((Mat*)image_nativeObj); Mat& image = *((Mat*)image_nativeObj);
bool _retval_ = me->retrieve( image ); bool _retval_ = me->retrieve( image );
return _retval_; return _retval_;
} catch(cv::Exception e) { } catch(cv::Exception e) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1retrieve__JJ() catched cv::Exception: %s", e.what()); LOGD("highgui::VideoCapture_n_1retrieve__JJ() catched cv::Exception: %s", e.what());
#endif // DEBUG
jclass je = env->FindClass("org/opencv/core/CvException"); jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception"); if(!je) je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, e.what()); env->ThrowNew(je, e.what());
return 0; return 0;
} catch (...) { } catch (...) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1retrieve__JJ() catched unknown exception (...)"); LOGD("highgui::VideoCapture_n_1retrieve__JJ() catched unknown exception (...)");
#endif // DEBUG
jclass je = env->FindClass("java/lang/Exception"); jclass je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1retrieve__JJ()}"); env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1retrieve__JJ()}");
return 0; return 0;
@ -404,25 +364,25 @@ JNIEXPORT jboolean JNICALL Java_org_opencv_highgui_VideoCapture_n_1set
(JNIEnv* env, jclass, jlong self, jint propId, jdouble value) (JNIEnv* env, jclass, jlong self, jint propId, jdouble value)
{ {
try { try {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1set()"); LOGD("highgui::VideoCapture_n_1set()");
#endif // DEBUG
VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL
bool _retval_ = me->set( propId, value ); bool _retval_ = me->set( propId, value );
return _retval_; return _retval_;
} catch(cv::Exception e) { } catch(cv::Exception e) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1set() catched cv::Exception: %s", e.what()); LOGD("highgui::VideoCapture_n_1set() catched cv::Exception: %s", e.what());
#endif // DEBUG
jclass je = env->FindClass("org/opencv/core/CvException"); jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception"); if(!je) je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, e.what()); env->ThrowNew(je, e.what());
return 0; return 0;
} catch (...) { } catch (...) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1set() catched unknown exception (...)"); LOGD("highgui::VideoCapture_n_1set() catched unknown exception (...)");
#endif // DEBUG
jclass je = env->FindClass("java/lang/Exception"); jclass je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1set()}"); env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1set()}");
return 0; return 0;
@ -436,25 +396,25 @@ JNIEXPORT jstring JNICALL Java_org_opencv_highgui_VideoCapture_n_1getSupportedPr
(JNIEnv *env, jclass, jlong self) (JNIEnv *env, jclass, jlong self)
{ {
try { try {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1set()"); LOGD("highgui::VideoCapture_n_1set()");
#endif // DEBUG
VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL VideoCapture* me = (VideoCapture*) self; //TODO: check for NULL
union {double prop; const char* name;} u; union {double prop; const char* name;} u;
u.prop = me->get(CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING); u.prop = me->get(CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING);
return env->NewStringUTF(u.name); return env->NewStringUTF(u.name);
} catch(cv::Exception e) { } catch(cv::Exception e) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1getSupportedPreviewSizes() catched cv::Exception: %s", e.what()); LOGD("highgui::VideoCapture_n_1getSupportedPreviewSizes() catched cv::Exception: %s", e.what());
#endif // DEBUG
jclass je = env->FindClass("org/opencv/core/CvException"); jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception"); if(!je) je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, e.what()); env->ThrowNew(je, e.what());
return env->NewStringUTF(""); return env->NewStringUTF("");
} catch (...) { } catch (...) {
#ifdef DEBUG
LOGD("highgui::VideoCapture_n_1getSupportedPreviewSizes() catched unknown exception (...)"); LOGD("highgui::VideoCapture_n_1getSupportedPreviewSizes() catched unknown exception (...)");
#endif // DEBUG
jclass je = env->FindClass("java/lang/Exception"); jclass je = env->FindClass("java/lang/Exception");
env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1getSupportedPreviewSizes()}"); env->ThrowNew(je, "Unknown exception in JNI code {highgui::VideoCapture_n_1getSupportedPreviewSizes()}");
return env->NewStringUTF(""); return env->NewStringUTF("");

2
modules/java/generator/src/cpp/converters.cpp
Unescape View File

@ -1,6 +1,6 @@
#include "converters.h" #include "converters.h"
#ifdef DEBUG #if defined DEBUG && defined ANDROID
#include <android/log.h> #include <android/log.h>
#define MODULE_LOG_TAG "OpenCV.converters" #define MODULE_LOG_TAG "OpenCV.converters"
#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, MODULE_LOG_TAG, __VA_ARGS__)) #define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, MODULE_LOG_TAG, __VA_ARGS__))

Write Preview
Loading…
Cancel
Save