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
5802ea39
Commit
5802ea39
authored
Nov 26, 2010
by
Maria Dimashova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed warnings of gcc
parent
5eae5427
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
calonder.cpp
modules/features2d/src/calonder.cpp
+2
-2
afeatures2d.cpp
tests/cv/src/afeatures2d.cpp
+7
-4
No files found.
modules/features2d/src/calonder.cpp
View file @
5802ea39
...
...
@@ -969,8 +969,8 @@ float RTreeClassifier::countZeroElements()
num_elem
=
trees_
.
size
()
*
trees_
[
0
].
num_leaves_
*
num_elem
;
float
flt_perc
=
100.
f
*
flt_zeros
/
num_elem
;
float
ui8_perc
=
100.
f
*
ui8_zeros
/
num_elem
;
printf
(
"[OK] RTC: overall %i/%i (%.3f%%) zeros in float leaves
\n
"
,
flt_zeros
,
num_elem
,
flt_perc
);
printf
(
" overall %i/%i (%.3f%%) zeros in uint8 leaves
\n
"
,
ui8_zeros
,
num_elem
,
ui8_perc
);
printf
(
"[OK] RTC: overall %i/%i (%.3f%%) zeros in float leaves
\n
"
,
(
int
)
flt_zeros
,
(
int
)
num_elem
,
flt_perc
);
printf
(
" overall %i/%i (%.3f%%) zeros in uint8 leaves
\n
"
,
(
int
)
ui8_zeros
,
(
int
)
num_elem
,
ui8_perc
);
return
flt_perc
;
}
...
...
tests/cv/src/afeatures2d.cpp
View file @
5802ea39
...
...
@@ -133,7 +133,7 @@ void CV_FeatureDetectorTest::compareKeypointSets( const vector<KeyPoint>& validK
float
countRatio
=
(
float
)
validKeypoints
.
size
()
/
(
float
)
calcKeypoints
.
size
();
if
(
countRatio
<
1
-
maxCountRatioDif
||
countRatio
>
1.
f
+
maxCountRatioDif
)
{
ts
->
printf
(
CvTS
::
LOG
,
"Bad keypoints count ratio (validCount = %d, calcCount = %d)
!
\n
"
,
ts
->
printf
(
CvTS
::
LOG
,
"Bad keypoints count ratio (validCount = %d, calcCount = %d)
.
\n
"
,
validKeypoints
.
size
(),
calcKeypoints
.
size
()
);
ts
->
set_failed_test_info
(
CvTS
::
FAIL_INVALID_OUTPUT
);
return
;
...
...
@@ -296,7 +296,6 @@ public:
maxDistDif
(
_maxDistDif
),
prevTime
(
_prevTime
),
dextractor
(
_dextractor
),
distance
(
d
)
{}
protected
:
virtual
void
createDescriptorExtractor
()
{}
CV_DescriptorExtractorTest
&
operator
=
(
const
CV_DescriptorExtractorTest
&
)
{}
void
compareDescriptors
(
const
Mat
&
validDescriptors
,
const
Mat
&
calcDescriptors
)
{
...
...
@@ -482,6 +481,9 @@ protected:
Ptr
<
DescriptorExtractor
>
dextractor
;
Distance
distance
;
private
:
CV_DescriptorExtractorTest
&
operator
=
(
const
CV_DescriptorExtractorTest
&
)
{
return
*
this
;
}
};
template
<
typename
T
,
typename
Distance
>
...
...
@@ -512,11 +514,10 @@ public:
{}
protected
:
static
const
int
dim
=
500
;
static
const
int
queryDescCount
=
300
;
// must be even number because we split train data in s
a
me cases in two
static
const
int
queryDescCount
=
300
;
// must be even number because we split train data in s
o
me cases in two
static
const
int
countFactor
=
4
;
// do not change it
const
float
badPart
;
CV_DescriptorMatcherTest
&
operator
=
(
const
CV_DescriptorMatcherTest
&
)
{}
virtual
void
run
(
int
);
void
generateData
(
Mat
&
query
,
Mat
&
train
);
...
...
@@ -526,6 +527,8 @@ protected:
void
radiusMatchTest
(
const
Mat
&
query
,
const
Mat
&
train
);
Ptr
<
DescriptorMatcher
>
dmatcher
;
private
:
CV_DescriptorMatcherTest
&
operator
=
(
const
CV_DescriptorMatcherTest
&
)
{
return
*
this
;
}
};
void
CV_DescriptorMatcherTest
::
emptyDataTest
()
...
...
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