Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
30f73623
Commit
30f73623
authored
May 01, 2014
by
Ievgen Khvedchenia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace runtime checks with assertions
parent
3e51da38
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
12 deletions
+13
-12
AKAZEFeatures.cpp
modules/features2d/src/akaze/AKAZEFeatures.cpp
+7
-7
KAZEFeatures.cpp
modules/features2d/src/kaze/KAZEFeatures.cpp
+6
-5
No files found.
modules/features2d/src/akaze/AKAZEFeatures.cpp
View file @
30f73623
...
@@ -96,12 +96,12 @@ void AKAZEFeatures::Allocate_Memory_Evolution(void) {
...
@@ -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) {
...
@@ -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
;
}
}
...
...
modules/features2d/src/kaze/KAZEFeatures.cpp
View file @
30f73623
...
@@ -139,11 +139,12 @@ int KAZEFeatures::Create_Nonlinear_Scale_Space(const cv::Mat &img) {
...
@@ -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();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment