Merge pull request #1893 from tompollok:3.4

alalek · alalek · commit feec6d7e10c7 · 2018-11-10T13:30:09.000Z
diff --git a/modules/bioinspired/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp b/modules/bioinspired/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
@@ -292,7 +292,7 @@ static void drawPlot(const cv::Mat curve, const std::string figureTitle, const i
 */
              cv::waitKey(10);
          }
-     }catch(cv::Exception e)
+     }catch(const cv::Exception& e)
      {
          std::cerr<<"Error using Retina : "<<e.what()<<std::endl;
      }
diff --git a/modules/bioinspired/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp b/modules/bioinspired/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
@@ -353,7 +353,7 @@ static void loadNewFrame(const std::string filenamePrototype, const int currentF
             // jump to next frame
             ++currentFrameIndex;
          }
-     }catch(cv::Exception e)
+     }catch(const cv::Exception& e)
      {
          std::cerr<<"Error using Retina : "<<e.what()<<std::endl;
      }
diff --git a/modules/bioinspired/samples/cpp/retinaDemo.cpp b/modules/bioinspired/samples/cpp/retinaDemo.cpp
@@ -146,7 +146,7 @@ int main(int argc, char* argv[]) {
 
             cv::waitKey(5);
         }
-    }catch(cv::Exception e)
+    }catch(const cv::Exception& e)
     {
         std::cerr<<"Error using Retina : "<<e.what()<<std::endl;
     }
diff --git a/modules/bioinspired/samples/cpp/tutorial_code/bioinspired/retina_tutorial.cpp b/modules/bioinspired/samples/cpp/tutorial_code/bioinspired/retina_tutorial.cpp
@@ -137,7 +137,7 @@ int main(int argc, char* argv[]) {
             cv::imshow("Retina Magno", retinaOutput_magno);
             cv::waitKey(10);
         }
-    }catch(cv::Exception e)
+    }catch(const cv::Exception& e)
     {
         std::cerr<<"Error using Retina or end of video sequence reached : "<<e.what()<<std::endl;
     }
diff --git a/modules/bioinspired/samples/ocl/retina_ocl.cpp b/modules/bioinspired/samples/ocl/retina_ocl.cpp
@@ -109,7 +109,7 @@ int main(int argc, char* argv[])
         }
         printf("Average: %.4fms\n", (double)total_time / total_loop_count / cv::getTickFrequency() * 1000.0);
     }
-    catch(cv::Exception e)
+    catch(const cv::Exception& e)
     {
         std::cerr << "Error using Retina : " << e.what() << std::endl;
     }
diff --git a/modules/bioinspired/src/retina.cpp b/modules/bioinspired/src/retina.cpp
@@ -368,7 +368,7 @@ void RetinaImpl::setup(String retinaParameterFile, const bool applyDefaultSetupO
         cv::FileStorage fs(retinaParameterFile, cv::FileStorage::READ);
         setup(fs, applyDefaultSetupOnFailure);
     }
-    catch(Exception &e)
+    catch(const Exception &e)
     {
         printf("Retina::setup: wrong/unappropriate xml parameter file : error report :`n=>%s\n", e.what());
         if (applyDefaultSetupOnFailure)
@@ -422,7 +422,7 @@ void RetinaImpl::setup(cv::FileStorage &fs, const bool applyDefaultSetupOnFailur
         setupIPLMagnoChannel(_retinaParameters.IplMagno.normaliseOutput, _retinaParameters.IplMagno.parasolCells_beta, _retinaParameters.IplMagno.parasolCells_tau, _retinaParameters.IplMagno.parasolCells_k, _retinaParameters.IplMagno.amacrinCellsTemporalCutFrequency,_retinaParameters.IplMagno.V0CompressionParameter, _retinaParameters.IplMagno.localAdaptintegration_tau, _retinaParameters.IplMagno.localAdaptintegration_k);
 
     }
-    catch(Exception &e)
+    catch(const Exception &e)
     {
         printf("RetinaImpl::setup: resetting retina with default parameters\n");
         if (applyDefaultSetupOnFailure)
diff --git a/modules/bioinspired/src/retina_ocl.cpp b/modules/bioinspired/src/retina_ocl.cpp
@@ -127,7 +127,7 @@ void RetinaOCLImpl::setup(String retinaParameterFile, const bool applyDefaultSet
         cv::FileStorage fs(retinaParameterFile, cv::FileStorage::READ);
         setup(fs, applyDefaultSetupOnFailure);
     }
-    catch(Exception &e)
+    catch(const Exception &e)
     {
         std::cout << "RetinaOCLImpl::setup: wrong/inappropriate xml parameter file : error report :`n=>" << e.what() << std::endl;
         if (applyDefaultSetupOnFailure)
@@ -181,7 +181,7 @@ void RetinaOCLImpl::setup(cv::FileStorage &fs, const bool applyDefaultSetupOnFai
         setupIPLMagnoChannel(_retinaParameters.IplMagno.normaliseOutput, _retinaParameters.IplMagno.parasolCells_beta, _retinaParameters.IplMagno.parasolCells_tau, _retinaParameters.IplMagno.parasolCells_k, _retinaParameters.IplMagno.amacrinCellsTemporalCutFrequency, _retinaParameters.IplMagno.V0CompressionParameter, _retinaParameters.IplMagno.localAdaptintegration_tau, _retinaParameters.IplMagno.localAdaptintegration_k);
 
     }
-    catch(Exception &e)
+    catch(const Exception &e)
     {
         std::cout << "RetinaOCLImpl::setup: resetting retina with default parameters" << std::endl;
         if (applyDefaultSetupOnFailure)
diff --git a/modules/bioinspired/src/transientareassegmentationmodule.cpp b/modules/bioinspired/src/transientareassegmentationmodule.cpp
@@ -298,7 +298,7 @@ void TransientAreasSegmentationModuleImpl::setup(String segmentationParameterFil
         // opening retinaParameterFile in read mode
         cv::FileStorage fs(segmentationParameterFile, cv::FileStorage::READ);
         setup(fs, applyDefaultSetupOnFailure);
-    }catch(cv::Exception &e)
+    }catch(const cv::Exception &e)
     {
         printf("Retina::setup: wrong/unappropriate xml parameter file : error report :`n=>%s\n", e.what());
         if (applyDefaultSetupOnFailure)
@@ -338,7 +338,7 @@ void TransientAreasSegmentationModuleImpl::setup(cv::FileStorage &fs, const bool
         currFn["contextEnergy_spatialConstant"]>>_segmentationParameters.contextEnergy_spatialConstant;
         setup(_segmentationParameters);
 
-    }catch(cv::Exception &e)
+    }catch(const cv::Exception &e)
     {
         std::cout<<"Retina::setup: resetting retina with default parameters"<<std::endl;
         if (applyDefaultSetupOnFailure)
diff --git a/modules/face/samples/facerec_demo.cpp b/modules/face/samples/facerec_demo.cpp
@@ -93,7 +93,7 @@ int main(int argc, const char *argv[]) {
     // input filename is given.
     try {
         read_csv(fn_csv, images, labels, labelsInfo);
-    } catch (cv::Exception& e) {
+    } catch (const cv::Exception& e) {
         cerr << "Error opening file \"" << fn_csv << "\". Reason: " << e.msg << endl;
         // nothing more we can do
         exit(1);
diff --git a/modules/face/samples/facerec_eigenfaces.cpp b/modules/face/samples/facerec_eigenfaces.cpp
@@ -85,7 +85,7 @@ int main(int argc, const char *argv[]) {
     // input filename is given.
     try {
         read_csv(fn_csv, images, labels);
-    } catch (cv::Exception& e) {
+    } catch (const cv::Exception& e) {
         cerr << "Error opening file \"" << fn_csv << "\". Reason: " << e.msg << endl;
         // nothing more we can do
         exit(1);
diff --git a/modules/face/samples/facerec_fisherfaces.cpp b/modules/face/samples/facerec_fisherfaces.cpp
@@ -85,7 +85,7 @@ int main(int argc, const char *argv[]) {
     // input filename is given.
     try {
         read_csv(fn_csv, images, labels);
-    } catch (cv::Exception& e) {
+    } catch (const cv::Exception& e) {
         cerr << "Error opening file \"" << fn_csv << "\". Reason: " << e.msg << endl;
         // nothing more we can do
         exit(1);
diff --git a/modules/face/samples/facerec_lbph.cpp b/modules/face/samples/facerec_lbph.cpp
@@ -62,7 +62,7 @@ int main(int argc, const char *argv[]) {
     // input filename is given.
     try {
         read_csv(fn_csv, images, labels);
-    } catch (cv::Exception& e) {
+    } catch (const cv::Exception& e) {
         cerr << "Error opening file \"" << fn_csv << "\". Reason: " << e.msg << endl;
         // nothing more we can do
         exit(1);
diff --git a/modules/face/samples/facerec_save_load.cpp b/modules/face/samples/facerec_save_load.cpp
@@ -85,7 +85,7 @@ int main(int argc, const char *argv[]) {
     // input filename is given.
     try {
         read_csv(fn_csv, images, labels);
-    } catch (cv::Exception& e) {
+    } catch (const cv::Exception& e) {
         cerr << "Error opening file \"" << fn_csv << "\". Reason: " << e.msg << endl;
         // nothing more we can do
         exit(1);
diff --git a/modules/face/samples/facerec_video.cpp b/modules/face/samples/facerec_video.cpp
@@ -68,7 +68,7 @@ int main(int argc, const char *argv[]) {
     // Read in the data (fails if no valid input filename is given, but you'll get an error message):
     try {
         read_csv(fn_csv, images, labels);
-    } catch (cv::Exception& e) {
+    } catch (const cv::Exception& e) {
         cerr << "Error opening file \"" << fn_csv << "\". Reason: " << e.msg << endl;
         // nothing more we can do
         exit(1);
diff --git a/modules/matlab/generator/templates/functional.cpp b/modules/matlab/generator/templates/functional.cpp
@@ -85,9 +85,9 @@ addVariant("{{ fun.name }}", {{ fun.req|inputs|length }}, {{ fun.opt|inputs|leng
   // [out =] namespace.fun(src1, ..., srcn, dst1, ..., dstn, opt1, ..., optn);
   try {
     {{ compose(fun) }}
-  } catch(cv::Exception& e) {
+  } catch(const cv::Exception& e) {
     error(std::string("cv::exception caught: ").append(e.what()).c_str());
-  } catch(std::exception& e) {
+  } catch(const std::exception& e) {
     error(std::string("std::exception caught: ").append(e.what()).c_str());
   } catch(...) {
     error("Uncaught exception occurred in {{fun.name}}");
diff --git a/modules/matlab/test/cv_exception.cpp b/modules/matlab/test/cv_exception.cpp
@@ -25,7 +25,7 @@ void mexFunction(int nlhs, mxArray* plhs[],
   // [out =] namespace.fun(src1, ..., srcn, dst1, ..., dstn, opt1, ..., optn);
   try {
     throw cv::Exception(-1, "OpenCV exception thrown", __func__, __FILE__, __LINE__);
-  } catch(cv::Exception& e) {
+  } catch(const cv::Exception& e) {
     mexErrMsgTxt(e.what());
   } catch(...) {
     mexErrMsgTxt("Incorrect exception caught!");
diff --git a/modules/matlab/test/std_exception.cpp b/modules/matlab/test/std_exception.cpp
@@ -24,7 +24,7 @@ void mexFunction(int nlhs, mxArray* plhs[],
   // [out =] namespace.fun(src1, ..., srcn, dst1, ..., dstn, opt1, ..., optn);
   try {
     throw std::exception();
-  } catch(std::exception& e) {
+  } catch(const std::exception& e) {
     mexErrMsgTxt(e.what());
   } catch(...) {
     mexErrMsgTxt("Incorrect exception caught!");
diff --git a/modules/ovis/src/ovis.cpp b/modules/ovis/src/ovis.cpp
@@ -149,7 +149,7 @@ static SceneNode& _getSceneNode(SceneManager* sceneMgr, const String& name)
         if(mo)
             return *mo->getParentSceneNode()->getParentSceneNode();
     }
-    catch (ItemIdentityException&)
+    catch (const ItemIdentityException&)
     {
         // ignore
     }
@@ -159,7 +159,7 @@ static SceneNode& _getSceneNode(SceneManager* sceneMgr, const String& name)
         if (!mo)
             mo = sceneMgr->getMovableObject(name, "Light");
     }
-    catch (ItemIdentityException&)
+    catch (const ItemIdentityException&)
     {
         // ignore
     }

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ static void drawPlot(const cv::Mat curve, const std::string figureTitle, const i`
`292`	`292`	`*/`
`293`	`293`	`cv::waitKey(10);`
`294`	`294`	`}`
`295`		`- }catch(cv::Exception e)`
	`295`	`+ }catch(const cv::Exception& e)`
`296`	`296`	`{`
`297`	`297`	`std::cerr<<"Error using Retina : "<<e.what()<<std::endl;`
`298`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ static void loadNewFrame(const std::string filenamePrototype, const int currentF`
`353`	`353`	`// jump to next frame`
`354`	`354`	`++currentFrameIndex;`
`355`	`355`	`}`
`356`		`- }catch(cv::Exception e)`
	`356`	`+ }catch(const cv::Exception& e)`
`357`	`357`	`{`
`358`	`358`	`std::cerr<<"Error using Retina : "<<e.what()<<std::endl;`
`359`	`359`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ int main(int argc, char* argv[]) {`
`146`	`146`
`147`	`147`	`cv::waitKey(5);`
`148`	`148`	`}`
`149`		`- }catch(cv::Exception e)`
	`149`	`+ }catch(const cv::Exception& e)`
`150`	`150`	`{`
`151`	`151`	`std::cerr<<"Error using Retina : "<<e.what()<<std::endl;`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ int main(int argc, char* argv[]) {`
`137`	`137`	`cv::imshow("Retina Magno", retinaOutput_magno);`
`138`	`138`	`cv::waitKey(10);`
`139`	`139`	`}`
`140`		`- }catch(cv::Exception e)`
	`140`	`+ }catch(const cv::Exception& e)`
`141`	`141`	`{`
`142`	`142`	`std::cerr<<"Error using Retina or end of video sequence reached : "<<e.what()<<std::endl;`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ int main(int argc, char* argv[])`
`109`	`109`	`}`
`110`	`110`	`printf("Average: %.4fms\n", (double)total_time / total_loop_count / cv::getTickFrequency() * 1000.0);`
`111`	`111`	`}`
`112`		`- catch(cv::Exception e)`
	`112`	`+ catch(const cv::Exception& e)`
`113`	`113`	`{`
`114`	`114`	`std::cerr << "Error using Retina : " << e.what() << std::endl;`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ void RetinaImpl::setup(String retinaParameterFile, const bool applyDefaultSetupO`
`368`	`368`	`cv::FileStorage fs(retinaParameterFile, cv::FileStorage::READ);`
`369`	`369`	`setup(fs, applyDefaultSetupOnFailure);`
`370`	`370`	`}`
`371`		`- catch(Exception &e)`
	`371`	`+ catch(const Exception &e)`
`372`	`372`	`{`
`373`	`373`	printf("Retina::setup: wrong/unappropriate xml parameter file : error report :`n=>%s\n", e.what());
`374`	`374`	`if (applyDefaultSetupOnFailure)`
`@@ -422,7 +422,7 @@ void RetinaImpl::setup(cv::FileStorage &fs, const bool applyDefaultSetupOnFailur`
`422`	`422`	`setupIPLMagnoChannel(_retinaParameters.IplMagno.normaliseOutput, _retinaParameters.IplMagno.parasolCells_beta, _retinaParameters.IplMagno.parasolCells_tau, _retinaParameters.IplMagno.parasolCells_k, _retinaParameters.IplMagno.amacrinCellsTemporalCutFrequency,_retinaParameters.IplMagno.V0CompressionParameter, _retinaParameters.IplMagno.localAdaptintegration_tau, _retinaParameters.IplMagno.localAdaptintegration_k);`
`423`	`423`
`424`	`424`	`}`
`425`		`- catch(Exception &e)`
	`425`	`+ catch(const Exception &e)`
`426`	`426`	`{`
`427`	`427`	`printf("RetinaImpl::setup: resetting retina with default parameters\n");`
`428`	`428`	`if (applyDefaultSetupOnFailure)`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ void RetinaOCLImpl::setup(String retinaParameterFile, const bool applyDefaultSet`
`127`	`127`	`cv::FileStorage fs(retinaParameterFile, cv::FileStorage::READ);`
`128`	`128`	`setup(fs, applyDefaultSetupOnFailure);`
`129`	`129`	`}`
`130`		`- catch(Exception &e)`
	`130`	`+ catch(const Exception &e)`
`131`	`131`	`{`
`132`	`132`	std::cout << "RetinaOCLImpl::setup: wrong/inappropriate xml parameter file : error report :`n=>" << e.what() << std::endl;
`133`	`133`	`if (applyDefaultSetupOnFailure)`
`@@ -181,7 +181,7 @@ void RetinaOCLImpl::setup(cv::FileStorage &fs, const bool applyDefaultSetupOnFai`
`181`	`181`	`setupIPLMagnoChannel(_retinaParameters.IplMagno.normaliseOutput, _retinaParameters.IplMagno.parasolCells_beta, _retinaParameters.IplMagno.parasolCells_tau, _retinaParameters.IplMagno.parasolCells_k, _retinaParameters.IplMagno.amacrinCellsTemporalCutFrequency, _retinaParameters.IplMagno.V0CompressionParameter, _retinaParameters.IplMagno.localAdaptintegration_tau, _retinaParameters.IplMagno.localAdaptintegration_k);`
`182`	`182`
`183`	`183`	`}`
`184`		`- catch(Exception &e)`
	`184`	`+ catch(const Exception &e)`
`185`	`185`	`{`
`186`	`186`	`std::cout << "RetinaOCLImpl::setup: resetting retina with default parameters" << std::endl;`
`187`	`187`	`if (applyDefaultSetupOnFailure)`