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
0faa75da
Commit
0faa75da
authored
Jul 29, 2010
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
inserted missing std:: (ticket #333). Thanks to trisk for the patch!
parent
97254a7b
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
15 deletions
+19
-15
calonder.cpp
modules/features2d/src/calonder.cpp
+2
-2
createsamples.cpp
modules/haartraining/createsamples.cpp
+2
-0
haartraining.cpp
modules/haartraining/haartraining.cpp
+2
-0
_kdtree.hpp
modules/imgproc/src/_kdtree.hpp
+5
-5
acameracalibration.cpp
tests/cv/src/acameracalibration.cpp
+3
-3
asolvepoly.cpp
tests/cxcore/src/asolvepoly.cpp
+3
-3
cxts.cpp
tests/cxts/cxts.cpp
+2
-2
No files found.
modules/features2d/src/calonder.cpp
View file @
0faa75da
...
...
@@ -413,7 +413,7 @@ static float percentile(float *data, int n, float p)
assert
(
n
>
0
);
assert
(
p
>=
0
&&
p
<=
1
);
std
::
vector
<
float
>
vec
(
data
,
data
+
n
);
sort
(
vec
.
begin
(),
vec
.
end
());
s
td
::
s
ort
(
vec
.
begin
(),
vec
.
end
());
int
ix
=
(
int
)(
p
*
(
n
-
1
));
return
vec
[
ix
];
}
...
...
@@ -1299,7 +1299,7 @@ static float percentile( const float* data, int n, float p )
assert( p>=0 && p<=1 );
vector<float> vec( data, data+n );
sort(vec.begin(), vec.end());
s
td::s
ort(vec.begin(), vec.end());
int ix = (int)(p*(n-1));
return vec[ix];
}
...
...
modules/haartraining/createsamples.cpp
View file @
0faa75da
...
...
@@ -50,6 +50,8 @@
#include <cstdlib>
#include <cmath>
using
namespace
std
;
#include "cvhaartraining.h"
int
main
(
int
argc
,
char
*
argv
[]
)
...
...
modules/haartraining/haartraining.cpp
View file @
0faa75da
...
...
@@ -49,6 +49,8 @@
#include <cstring>
#include <cstdlib>
using
namespace
std
;
#include "cvhaartraining.h"
int
main
(
int
argc
,
char
*
argv
[]
)
...
...
modules/imgproc/src/_kdtree.hpp
View file @
0faa75da
...
...
@@ -337,7 +337,7 @@ private:
// add bbf_node for alternate branch in priority queue
pq
.
push_back
(
bbf_node
(
alt_n
,
dist
));
push_heap
(
pq
.
begin
(),
pq
.
end
());
std
::
push_heap
(
pq
.
begin
(),
pq
.
end
());
}
// called by bbf to walk to leaf;
...
...
@@ -374,11 +374,11 @@ private:
bbf_nn
nn
(
p
,
distance
(
d
,
p
));
if
((
int
)
nn_pq
.
size
()
<
k
)
{
nn_pq
.
push_back
(
nn
);
push_heap
(
nn_pq
.
begin
(),
nn_pq
.
end
());
std
::
push_heap
(
nn_pq
.
begin
(),
nn_pq
.
end
());
}
else
if
(
nn_pq
[
0
].
dist
>
nn
.
dist
)
{
pop_heap
(
nn_pq
.
begin
(),
nn_pq
.
end
());
std
::
pop_heap
(
nn_pq
.
begin
(),
nn_pq
.
end
());
nn_pq
.
end
()[
-
1
]
=
nn
;
push_heap
(
nn_pq
.
begin
(),
nn_pq
.
end
());
std
::
push_heap
(
nn_pq
.
begin
(),
nn_pq
.
end
());
}
assert
(
nn_pq
.
size
()
<
2
||
nn_pq
[
0
].
dist
>=
nn_pq
[
1
].
dist
);
}
...
...
@@ -405,7 +405,7 @@ public:
while
(
tmp_pq
.
size
()
&&
emax
>
0
)
{
// from node nearest query point d, run to leaf
pop_heap
(
tmp_pq
.
begin
(),
tmp_pq
.
end
());
std
::
pop_heap
(
tmp_pq
.
begin
(),
tmp_pq
.
end
());
bbf_node
bbf
(
tmp_pq
.
end
()[
-
1
]);
tmp_pq
.
erase
(
tmp_pq
.
end
()
-
1
);
...
...
tests/cv/src/acameracalibration.cpp
View file @
0faa75da
...
...
@@ -1610,9 +1610,9 @@ double CV_StereoCalibrationTest_C::calibrateStereoCamera( const vector<vector<Po
{
ni
=
(
int
)
objectPoints
[
i
].
size
();
((
int
*
)
npoints
.
data
)[
i
]
=
ni
;
copy
(
objectPoints
[
i
].
begin
(),
objectPoints
[
i
].
end
(),
objPtData
+
j
);
copy
(
imagePoints1
[
i
].
begin
(),
imagePoints1
[
i
].
end
(),
imgPtData
+
j
);
copy
(
imagePoints2
[
i
].
begin
(),
imagePoints2
[
i
].
end
(),
imgPtData2
+
j
);
std
::
copy
(
objectPoints
[
i
].
begin
(),
objectPoints
[
i
].
end
(),
objPtData
+
j
);
std
::
copy
(
imagePoints1
[
i
].
begin
(),
imagePoints1
[
i
].
end
(),
imgPtData
+
j
);
std
::
copy
(
imagePoints2
[
i
].
begin
(),
imagePoints2
[
i
].
end
(),
imgPtData2
+
j
);
}
CvMat
_objPt
=
objPt
,
_imgPt
=
imgPt
,
_imgPt2
=
imgPt2
,
_npoints
=
npoints
;
CvMat
_cameraMatrix1
=
cameraMatrix1
,
_distCoeffs1
=
distCoeffs1
;
...
...
tests/cxcore/src/asolvepoly.cpp
View file @
0faa75da
...
...
@@ -98,8 +98,8 @@ void CV_SolvePolyTest::run( int )
for
(
int
j
=
0
;
j
<
n
;
++
j
)
ar
[
j
]
=
complex_type
(
u
[
j
*
2
],
u
[
j
*
2
+
1
]);
sort
(
r
.
begin
(),
r
.
end
(),
pred_complex
());
sort
(
ar
.
begin
(),
ar
.
end
(),
pred_complex
());
s
td
::
s
ort
(
r
.
begin
(),
r
.
end
(),
pred_complex
());
s
td
::
s
ort
(
ar
.
begin
(),
ar
.
end
(),
pred_complex
());
pass
=
true
;
if
(
n
==
3
)
...
...
@@ -114,7 +114,7 @@ void CV_SolvePolyTest::run( int )
nr2
=
cv
::
solveCubic
(
cv
::
Mat_
<
float
>
(
cv
::
Mat
(
&
amat
)),
umat2
);
cvFlip
(
&
amat
,
&
amat
,
0
);
if
(
nr2
>
0
)
sort
(
ar2
.
begin
(),
ar2
.
begin
()
+
nr2
,
pred_double
());
s
td
::
s
ort
(
ar2
.
begin
(),
ar2
.
begin
()
+
nr2
,
pred_double
());
ar2
.
resize
(
nr2
);
int
nr1
=
0
;
...
...
tests/cxts/cxts.cpp
View file @
0faa75da
...
...
@@ -886,8 +886,8 @@ void CvTest::run( int start_from )
break
;
}
sort
(
v_cpe
.
begin
(),
v_cpe
.
end
());
sort
(
v_time
.
begin
(),
v_time
.
end
());
s
td
::
s
ort
(
v_cpe
.
begin
(),
v_cpe
.
end
());
s
td
::
s
ort
(
v_time
.
begin
(),
v_time
.
end
());
t_cpu_acc
=
v_cpe
[
i
/
2
];
t_acc
=
v_time
[
i
/
2
];
...
...
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