generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace runtime checks with assertions

Browse Source
This commit is contained in:
Ievgen Khvedchenia 2014-05-01 18:24:13 +03:00
parent 3e51da38fb
commit 30f73623ce
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/features2d/src/akaze/AKAZEFeatures.cpp
View File

@ -96,12 +96,12 @@ void AKAZEFeatures::Allocate_Memory_Evolution(void) {
int AKAZEFeatures::Create_Nonlinear_Scale_Space(const cv::Mat& img) { int AKAZEFeatures::Create_Nonlinear_Scale_Space(const cv::Mat& img) {
//double t1 = 0.0, t2 = 0.0; //double t1 = 0.0, t2 = 0.0;
CV_Assert(evolution_.size() > 0);
if (evolution_.size() == 0) { //if (evolution_.size() == 0) {
cerr << "Error generating the nonlinear scale space!!" << endl; // cerr << "Error generating the nonlinear scale space!!" << endl;
cerr << "Firstly you need to call AKAZEFeatures::Allocate_Memory_Evolution()" << endl; // cerr << "Firstly you need to call AKAZEFeatures::Allocate_Memory_Evolution()" << endl;
return -1; // return -1;
} //}
//t1 = cv::getTickCount(); //t1 = cv::getTickCount();
@ -148,7 +148,7 @@ int AKAZEFeatures::Create_Nonlinear_Scale_Space(const cv::Mat& img) {
charbonnier_diffusivity(evolution_[i].Lx, evolution_[i].Ly, evolution_[i].Lflow, options_.kcontrast); charbonnier_diffusivity(evolution_[i].Lx, evolution_[i].Ly, evolution_[i].Lflow, options_.kcontrast);
break; break;
default: default:
cerr << "Diffusivity: " << static_cast<int>(options_.diffusivity) << " is not supported" << endl; CV_Error(options_.diffusivity, "Diffusivity is not supported");
break; break;
} }

11
modules/features2d/src/kaze/KAZEFeatures.cpp
View File

@ -139,11 +139,12 @@ int KAZEFeatures::Create_Nonlinear_Scale_Space(const cv::Mat &img) {
//double t2 = 0.0, t1 = 0.0; //double t2 = 0.0, t1 = 0.0;
if (evolution_.size() == 0) { CV_Assert(evolution_.size() > 0);
cout << "Error generating the nonlinear scale space!!" << endl; //if (evolution_.size() == 0) {
cout << "Firstly you need to call KAZE::Allocate_Memory_Evolution()" << endl; // cout << "Error generating the nonlinear scale space!!" << endl;
return -1; // cout << "Firstly you need to call KAZE::Allocate_Memory_Evolution()" << endl;
} // return -1;
//}
//t1 = getTickCount(); //t1 = getTickCount();