potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 07:13:02 +04:00
Code Packages Releases Wiki Activity

Revert CV_TRY/CV_CATCH macros

Browse Source 
This reverts commit 7349b8f5ce (partially).
This commit is contained in:
Alexander Alekhin
2018-11-08 19:46:25 +03:00
parent e5d7f446d6
commit b74b05d1b3
18 changed files with 119 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/objdetect/src/detection_based_tracker.cpp
+6 -6
View File
@@ -284,23 +284,23 @@ bool cv::DetectionBasedTracker::SeparateDetectionWork::run()
}
#define CATCH_ALL_AND_LOG(_block) \
CV_TRY { \
try { \
_block; \
} \
CV_CATCH(cv::Exception, e) { \
catch(cv::Exception& e) { \
LOGE0("\n %s: ERROR: OpenCV Exception caught: \n'%s'\n\n", CV_Func, e.what()); \
} CV_CATCH(std::exception, e) { \
} catch(std::exception& e) { \
LOGE0("\n %s: ERROR: Exception caught: \n'%s'\n\n", CV_Func, e.what()); \
} CV_CATCH_ALL { \
} catch(...) { \
LOGE0("\n %s: ERROR: UNKNOWN Exception caught\n\n", CV_Func); \
}
void* cv::workcycleObjectDetectorFunction(void* p)
{
CATCH_ALL_AND_LOG({ ((cv::DetectionBasedTracker::SeparateDetectionWork*)p)->workcycleObjectDetector(); });
CV_TRY{
try{
((cv::DetectionBasedTracker::SeparateDetectionWork*)p)->init();
} CV_CATCH_ALL {
} catch(...) {
LOGE0("DetectionBasedTracker: workcycleObjectDetectorFunction: ERROR concerning pointer, received as the function parameter");
}
return NULL;