mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-06 00:43:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactoring catching all exceptions as const ref

Browse Source
This commit is contained in:
tompollok 2018-10-19 22:21:20 +02:00 committed by Alexander Alekhin
parent b74b05d1b3
commit 2da56d5af6
38 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/command_line_parser.cpp
View File

@ -149,7 +149,7 @@ void CommandLineParser::getByName(const String& name, bool space_delete, int typ
}
}
}
catch (Exception& e)
catch (const Exception& e)
{
impl->error = true;
impl->error_message = impl->error_message + "Parameter '"+ name + "': " + e.err + "\n";
@ -182,7 +182,7 @@ void CommandLineParser::getByIndex(int index, bool space_delete, int type, void*
}
}
}
catch(Exception& e)
catch (const Exception& e)
{
impl->error = true;
impl->error_message = impl->error_message + format("Parameter #%d: ", index) + e.err + "\n";

4
modules/core/src/lut.cpp
View File

@ -120,11 +120,11 @@ static bool openvx_LUT(Mat src, Mat dst, Mat _lut)
lut.copyFrom(_lut);
ivx::IVX_CHECK_STATUS(vxuTableLookup(ctx, ia, lut, ib));
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError& e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError& e)
{
VX_DbgThrow(e.what());
}

4
modules/core/src/mean.cpp
View File

@ -648,11 +648,11 @@ static bool ocl_meanStdDev( InputArray _src, OutputArray _mean, OutputArray _sdv
pstddev[c] = 0;
}
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
VX_DbgThrow(e.what());
}

4
modules/core/src/minmax.cpp
View File

@ -433,11 +433,11 @@ static bool openvx_minMaxIdx(Mat &src, double* minVal, double* maxVal, int* minI
ofs2idx(src, maxidx, maxIdx);
}
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
VX_DbgThrow(e.what());
}

4
modules/core/src/persistence_c.cpp
View File

@ -417,7 +417,7 @@ cvOpenFileStorage( const char* query, CvMemStorage* dststorage, int flags, const
//mode = cvGetErrMode();
//cvSetErrMode( CV_ErrModeSilent );
CV_TRY
try
{
switch (fs->fmt)
{
@ -427,7 +427,7 @@ cvOpenFileStorage( const char* query, CvMemStorage* dststorage, int flags, const
default: break;
}
}
CV_CATCH_ALL
catch (...)
{
fs->is_opened = true;
cvReleaseFileStorage( &fs );

4
modules/core/src/persistence_types.cpp
View File

@ -756,11 +756,11 @@ static void* icvReadSeq( CvFileStorage* fs, CvFileNode* node )
flags |= CV_SEQ_FLAG_HOLE;
if( !strstr(flags_str, "untyped") )
{
CV_TRY
try
{
flags |= icvDecodeSimpleFormat(dt);
}
CV_CATCH_ALL
catch (...)
{
}
}

4
modules/features2d/src/fast.cpp
View File

@ -401,11 +401,11 @@ static bool openvx_FAST(InputArray _img, std::vector<KeyPoint>& keypoints,
img.swapHandle();
#endif
}
catch (RuntimeError & e)
catch (const RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (WrapperError & e)
catch (const WrapperError & e)
{
VX_DbgThrow(e.what());
}

4
modules/imgproc/src/accum.cpp
View File

@ -291,11 +291,11 @@ static bool openvx_accumulate(InputArray _src, InputOutputArray _dst, InputArray
srcImage.swapHandle(); dstImage.swapHandle();
#endif
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
VX_DbgThrow(e.what());
}

4
modules/imgproc/src/box_filter.cpp
View File

@ -1559,11 +1559,11 @@ namespace cv
ivx::IVX_CHECK_STATUS(vxuBox3x3(ctx, ia, ib));
ctx.setImmediateBorder(prevBorder);
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
VX_DbgThrow(e.what());
}

4
modules/imgproc/src/deriv.cpp
View File

@ -246,11 +246,11 @@ namespace cv
ivx::IVX_CHECK_STATUS(vxuSobel3x3(ctx, ia, NULL, ib));
ctx.setImmediateBorder(prevBorder);
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
VX_DbgThrow(e.what());
}

4
modules/imgproc/src/featureselect.cpp
View File

@ -342,11 +342,11 @@ static bool openvx_harris(Mat image, OutputArray _corners,
ovxImage.swapHandle();
#endif
}
catch (RuntimeError & e)
catch (const RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (WrapperError & e)
catch (const WrapperError & e)
{
VX_DbgThrow(e.what());
}

8
modules/imgproc/src/histogram.cpp
View File

@ -793,11 +793,11 @@ namespace cv
img.swapHandle();
#endif
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
VX_DbgThrow(e.what());
}
@ -3313,11 +3313,11 @@ static bool openvx_equalize_hist(Mat srcMat, Mat dstMat)
srcImage.swapHandle(); dstImage.swapHandle();
#endif
}
catch (RuntimeError & e)
catch (const RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (WrapperError & e)
catch (const WrapperError & e)
{
VX_DbgThrow(e.what());
}

4
modules/imgproc/src/imgwarp.cpp
View File

@ -1598,12 +1598,12 @@ static bool openvx_remap(Mat src, Mat dst, Mat map1, Mat map2, int interpolation
ctx.setImmediateBorder(prevBorder);
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
CV_Error(CV_StsInternal, e.what());
return false;
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
CV_Error(CV_StsInternal, e.what());
return false;

4
modules/imgproc/src/median_blur.cpp
View File

@ -1068,11 +1068,11 @@ static bool openvx_medianFilter(InputArray _src, OutputArray _dst, int ksize)
#endif
ctx.setImmediateBorder(prevBorder);
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
VX_DbgThrow(e.what());
}

4
modules/imgproc/src/pyramids.cpp
View File

@ -861,11 +861,11 @@ static bool openvx_pyrDown( InputArray _src, OutputArray _dst, const Size& _dsz,
srcImg.swapHandle(); dstImg.swapHandle();
#endif
}
catch (RuntimeError & e)
catch (const RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (WrapperError & e)
catch (const WrapperError & e)
{
VX_DbgThrow(e.what());
}

4
modules/imgproc/src/smooth.cpp
View File

@ -2305,11 +2305,11 @@ static bool openvx_gaussianBlur(InputArray _src, OutputArray _dst, Size ksize,
ivx::IVX_CHECK_STATUS(vxuGaussian3x3(ctx, ia, ib));
ctx.setImmediateBorder(prevBorder);
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
VX_DbgThrow(e.what());
}

4
modules/imgproc/src/thresh.cpp
View File

@ -1374,11 +1374,11 @@ static bool openvx_threshold(Mat src, Mat dst, int thresh, int maxval, int type)
}
#endif
}
catch (ivx::RuntimeError & e)
catch (const ivx::RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (ivx::WrapperError & e)
catch (const ivx::WrapperError & e)
{
VX_DbgThrow(e.what());
}

4
modules/objdetect/src/detection_based_tracker.cpp
View File

@ -287,9 +287,9 @@ bool cv::DetectionBasedTracker::SeparateDetectionWork::run()
try { \
_block; \
} \
catch(cv::Exception& e) { \
catch(const cv::Exception& e) { \
LOGE0("\n %s: ERROR: OpenCV Exception caught: \n'%s'\n\n", CV_Func, e.what()); \
} catch(std::exception& e) { \
} catch(const std::exception& e) { \
LOGE0("\n %s: ERROR: Exception caught: \n'%s'\n\n", CV_Func, e.what()); \
} catch(...) { \
LOGE0("\n %s: ERROR: UNKNOWN Exception caught\n\n", CV_Func); \

4
modules/ts/include/opencv2/ts/ts_ext.hpp
View File

@ -36,7 +36,7 @@ extern int testThreads;
Body(); \
CV__TEST_CLEANUP \
} \
catch (cvtest::SkipTestException& e) \
catch (const cvtest::SkipTestException& e) \
{ \
printf("[ SKIP ] %s\n", e.what()); \
} \
@ -84,7 +84,7 @@ extern int testThreads;
Body(); \
CV__TEST_CLEANUP \
} \
catch (cvtest::SkipTestException& e) \
catch (const cvtest::SkipTestException& e) \
{ \
printf("[ SKIP ] %s\n", e.what()); \
} \

12
modules/ts/src/ts_perf.cpp
View File

@ -232,7 +232,7 @@ void Regression::init(const std::string& testSuitName, const std::string& ext)
storageOutPath += ext;
}
}
catch(cv::Exception&)
catch(const cv::Exception&)
{
LOGE("Failed to open sanity data for reading: %s", storageInPath.c_str());
}
@ -1987,22 +1987,22 @@ void TestBase::RunPerfTestBody()
implConf.GetImpl();
#endif
}
catch(SkipTestException&)
catch(const SkipTestException&)
{
metrics.terminationReason = performance_metrics::TERM_SKIP_TEST;
return;
}
catch(PerfSkipTestException&)
catch(const PerfSkipTestException&)
{
metrics.terminationReason = performance_metrics::TERM_SKIP_TEST;
return;
}
catch(PerfEarlyExitException&)
catch(const PerfEarlyExitException&)
{
metrics.terminationReason = performance_metrics::TERM_INTERRUPT;
return;//no additional failure logging
}
catch(cv::Exception& e)
catch(const cv::Exception& e)
{
metrics.terminationReason = performance_metrics::TERM_EXCEPTION;
#ifdef HAVE_CUDA
@ -2011,7 +2011,7 @@ void TestBase::RunPerfTestBody()
#endif
FAIL() << "Expected: PerfTestBody() doesn't throw an exception.\n Actual: it throws cv::Exception:\n " << e.what();
}
catch(std::exception& e)
catch(const std::exception& e)
{
metrics.terminationReason = performance_metrics::TERM_EXCEPTION;
FAIL() << "Expected: PerfTestBody() doesn't throw an exception.\n Actual: it throws std::exception:\n " << e.what();

4
modules/video/src/lkpyramid.cpp
View File

@ -1191,11 +1191,11 @@ namespace
prevImg.swapHandle(); nextImg.swapHandle();
#endif
}
catch (RuntimeError & e)
catch (const RuntimeError & e)
{
VX_DbgThrow(e.what());
}
catch (WrapperError & e)
catch (const WrapperError & e)
{
VX_DbgThrow(e.what());
}

2
modules/videoio/src/cap_cmu.cpp
View File

@ -362,7 +362,7 @@ bool CvCaptureCAM_CMU::open( int _index )
CMU_numActiveCameras++;
CMU_useCameraFlags[_index] = true;
}
catch ( int )
catch (const int &)
{
return false;
}

22
modules/videoio/src/cap_gphoto2.cpp
View File

@ -70,7 +70,7 @@ public:
return gp_result_as_string(result);
}
friend std::ostream & operator<<(std::ostream & ostream,
GPhoto2Exception & e)
const GPhoto2Exception & e)
{
return ostream << e.method << ": " << e.what();
}
@ -336,7 +336,7 @@ void DigitalCameraCapture::initContext()
CR(gp_camera_autodetect(allDevices, context));
CR(numDevices = gp_list_count(allDevices));
}
catch (GPhoto2Exception & e)
catch (const GPhoto2Exception & e)
{
numDevices = 0;
}
@ -389,7 +389,7 @@ DigitalCameraCapture::~DigitalCameraCapture()
gp_context_unref(context);
context = NULL;
}
catch (GPhoto2Exception & e)
catch (const GPhoto2Exception & e)
{
message(ERROR, "destruction error", e);
}
@ -442,7 +442,7 @@ bool DigitalCameraCapture::open(int index)
opened = true;
return true;
}
catch (GPhoto2Exception & e)
catch (const GPhoto2Exception & e)
{
message(WARNING, "opening device failed", e);
return false;
@ -491,7 +491,7 @@ void DigitalCameraCapture::close()
rootWidget = NULL;
}
}
catch (GPhoto2Exception & e)
catch (const GPhoto2Exception & e)
{
message(ERROR, "cannot close device properly", e);
}
@ -664,7 +664,7 @@ double DigitalCameraCapture::getProperty(int propertyId) const
}
}
}
catch (GPhoto2Exception & e)
catch (const GPhoto2Exception & e)
{
char buf[128] = "";
sprintf(buf, "cannot get property: %d", propertyId);
@ -807,7 +807,7 @@ bool DigitalCameraCapture::setProperty(int propertyId, double value)
CR(gp_widget_set_changed(widget, 0));
}
}
catch (GPhoto2Exception & e)
catch (const GPhoto2Exception & e)
{
char buf[128] = "";
sprintf(buf, "cannot set property: %d to %f", propertyId, value);
@ -849,7 +849,7 @@ bool DigitalCameraCapture::grabFrame()
capturedFrames++;
grabbedFrames.push_back(file);
}
catch (GPhoto2Exception & e)
catch (const GPhoto2Exception & e)
{
if (file)
gp_file_unref(file);
@ -873,7 +873,7 @@ bool DigitalCameraCapture::retrieveFrame(int, OutputArray outputFrame)
readFrameFromFile(file, outputFrame);
CR(gp_file_unref(file));
}
catch (GPhoto2Exception & e)
catch (const GPhoto2Exception & e)
{
message(WARNING, "cannot read file grabbed from device", e);
return false;
@ -914,7 +914,7 @@ int DigitalCameraCapture::findDevice(const char * deviceName) const
}
}
}
catch (GPhoto2Exception & e)
catch (const GPhoto2Exception & e)
{
; // pass
}
@ -980,7 +980,7 @@ CameraWidget * DigitalCameraCapture::findWidgetByName(
}
return (it != end) ? it->second : NULL;
}
catch (GPhoto2Exception & e)
catch (const GPhoto2Exception & e)
{
message(WARNING, "error while searching for widget", e);
}

12
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
View File

@ -88,7 +88,7 @@ JNIEXPORT jlong JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker
//trackingDetector->setMinObjectSize(Size(faceSize, faceSize));
}
}
catch(cv::Exception& e)
catch(const cv::Exception& e)
{
LOGD("nativeCreateObject caught cv::Exception: %s", e.what());
jclass je = jenv->FindClass("org/opencv/core/CvException");
@ -121,7 +121,7 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_
delete (DetectorAgregator*)thiz;
}
}
catch(cv::Exception& e)
catch(const cv::Exception& e)
{
LOGD("nativeestroyObject caught cv::Exception: %s", e.what());
jclass je = jenv->FindClass("org/opencv/core/CvException");
@ -147,7 +147,7 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_
{
((DetectorAgregator*)thiz)->tracker->run();
}
catch(cv::Exception& e)
catch(const cv::Exception& e)
{
LOGD("nativeStart caught cv::Exception: %s", e.what());
jclass je = jenv->FindClass("org/opencv/core/CvException");
@ -173,7 +173,7 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_
{
((DetectorAgregator*)thiz)->tracker->stop();
}
catch(cv::Exception& e)
catch(const cv::Exception& e)
{
LOGD("nativeStop caught cv::Exception: %s", e.what());
jclass je = jenv->FindClass("org/opencv/core/CvException");
@ -203,7 +203,7 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_
//((DetectorAgregator*)thiz)->trackingDetector->setMinObjectSize(Size(faceSize, faceSize));
}
}
catch(cv::Exception& e)
catch(const cv::Exception& e)
{
LOGD("nativeStop caught cv::Exception: %s", e.what());
jclass je = jenv->FindClass("org/opencv/core/CvException");
@ -233,7 +233,7 @@ JNIEXPORT void JNICALL Java_org_opencv_samples_facedetect_DetectionBasedTracker_
((DetectorAgregator*)thiz)->tracker->getObjects(RectFaces);
*((Mat*)faces) = Mat(RectFaces, true);
}
catch(cv::Exception& e)
catch(const cv::Exception& e)
{
LOGD("nativeCreateObject caught cv::Exception: %s", e.what());
jclass je = jenv->FindClass("org/opencv/core/CvException");

8
samples/android/tutorial-4-opencl/jni/CLprocessor.cpp
View File

@ -63,11 +63,11 @@ void dumpCLinfo()
i, name.c_str(), (type==CL_DEVICE_TYPE_GPU ? "GPU" : "CPU"), extensions.c_str() );
}
}
catch(cl::Error& e)
catch(const cl::Error& e)
{
LOGE( "OpenCL info: error while gathering OpenCL info: %s (%d)", e.what(), e.err() );
}
catch(std::exception& e)
catch(const std::exception& e)
{
LOGE( "OpenCL info: error while gathering OpenCL info: %s", e.what() );
}
@ -130,11 +130,11 @@ extern "C" void initCL()
LOGE("Can't init OpenCV with OpenCL TAPI");
haveOpenCL = true;
}
catch(cl::Error& e)
catch(const cl::Error& e)
{
LOGE("cl::Error: %s (%d)", e.what(), e.err());
}
catch(std::exception& e)
catch(const std::exception& e)
{
LOGE("std::exception: %s", e.what());
}

2
samples/cpp/detect_blob.cpp
View File

@ -192,7 +192,7 @@ int main(int argc, char *argv[])
imshow("Original", img);
waitKey();
}
catch (Exception& e)
catch (const Exception& e)
{
cout << "Feature : " << *itDesc << "\n";
cout << e.msg << endl;

2
samples/cpp/detect_mser.cpp
View File

@ -523,7 +523,7 @@ int main(int argc, char *argv[])
imshow(winName, result);
imshow("Original", img);
}
catch (Exception& e)
catch (const Exception& e)
{
cout << "Feature: " << *itDesc << "\n";
cout << e.msg << endl;

2
samples/cpp/live_detect_qrcode.cpp
View File

@ -175,7 +175,7 @@ int showImageQRCodeDetect(string in, string out)
{
imwrite(out, color_src, compression_params);
}
catch (cv::Exception& ex)
catch (const cv::Exception& ex)
{
cout << "Exception converting image to PNG format: ";
cout << ex.what() << '\n';

8
samples/cpp/matchmethod_orb_akaze_brisk.cpp
View File

@ -147,15 +147,15 @@ int main(int argc, char *argv[])
desMethCmp.push_back(cumSumDist2);
waitKey();
}
catch (Exception& e)
{
catch (const Exception& e)
{
cout << e.msg << endl;
cout << "Cumulative distance cannot be computed." << endl;
desMethCmp.push_back(-1);
}
}
}
}
catch (Exception& e)
catch (const Exception& e)
{
cout << "Feature : " << *itDesc << "\n";
if (itMatcher != typeAlgoMatch.end())

2
samples/cpp/pca.cpp
View File

@ -141,7 +141,7 @@ int main(int argc, char** argv)
// Read in the data. This can fail if not valid
try {
read_imgList(imgList, images);
} catch (cv::Exception& e) {
} catch (const cv::Exception& e) {
cerr << "Error opening file \"" << imgList << "\". Reason: " << e.msg << endl;
exit(1);
}

2
samples/directx/d3d10_interop.cpp
View File

@ -260,7 +260,7 @@ public:
}
} // try
catch (cv::Exception& e)
catch (const cv::Exception& e)
{
std::cerr << "Exception: " << e.what() << std::endl;
return 10;

2
samples/directx/d3d11_interop.cpp
View File

@ -378,7 +378,7 @@ public:
}
} // try
catch (cv::Exception& e)
catch (const cv::Exception& e)
{
std::cerr << "Exception: " << e.what() << std::endl;
cleanup();

2
samples/directx/d3d9_interop.cpp
View File

@ -225,7 +225,7 @@ public:
}
} // try
catch (cv::Exception& e)
catch (const cv::Exception& e)
{
std::cerr << "Exception: " << e.what() << std::endl;
return 10;

2
samples/directx/d3d9ex_interop.cpp
View File

@ -226,7 +226,7 @@ public:
} // try
catch (cv::Exception& e)
catch (const cv::Exception& e)
{
std::cerr << "Exception: " << e.what() << std::endl;
return 10;

2
samples/directx/d3dsample.hpp
View File

@ -158,7 +158,7 @@ int d3d_app(int argc, char** argv, std::string& title)
return app.run();
}
catch (cv::Exception& e)
catch (const cv::Exception& e)
{
std::cerr << "Exception: " << e.what() << std::endl;
return 10;

2
samples/opencl/opencl-opencv-interop.cpp
View File

@ -676,7 +676,7 @@ int App::initVideoSource()
throw std::runtime_error(std::string("specify video source"));
}
catch (std::exception e)
catch (const std::exception e)
{
cerr << "ERROR: " << e.what() << std::endl;
return -1;

4
samples/opengl/opengl_interop.cpp
View File

@ -325,7 +325,7 @@ public:
}
catch (cv::Exception& e)
catch (const cv::Exception& e)
{
std::cerr << "Exception: " << e.what() << std::endl;
return 10;
@ -520,7 +520,7 @@ int main(int argc, char** argv)
app.create();
return app.run();
}
catch (cv::Exception& e)
catch (const cv::Exception& e)
{
cerr << "Exception: " << e.what() << endl;
return 10;

2
samples/va_intel/va_intel_interop.cpp
View File

@ -256,7 +256,7 @@ int main(int argc, char** argv)
std::cout << "Interop " << (doInterop ? "ON " : "OFF") << ": processing time, msec: " << time << std::endl;
}
catch (std::exception& ex)
catch (const std::exception& ex)
{
std::cerr << "ERROR: " << ex.what() << std::endl;
}