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
97835a8f
Commit
97835a8f
authored
Apr 12, 2012
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed 9 more build warnings
parent
3b3d1a86
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
10 deletions
+15
-10
spinimages.cpp
modules/contrib/src/spinimages.cpp
+1
-1
matmul.cpp
modules/core/src/matmul.cpp
+1
-1
test_math.cpp
modules/core/test/test_math.cpp
+2
-2
grfmt_png.cpp
modules/highgui/src/grfmt_png.cpp
+5
-0
test_emknearestkmeans.cpp
modules/ml/test/test_emknearestkmeans.cpp
+3
-3
perf_optflowpyrlk.cpp
modules/video/perf/perf_optflowpyrlk.cpp
+1
-1
precomp.hpp
modules/videostab/src/precomp.hpp
+2
-2
No files found.
modules/contrib/src/spinimages.cpp
View file @
97835a8f
...
...
@@ -440,7 +440,7 @@ cv::Mesh3D::~Mesh3D() {}
void
cv
::
Mesh3D
::
buildOctree
()
{
if
(
octree
.
getNodes
().
empty
())
octree
.
buildTree
(
vtx
);
}
void
cv
::
Mesh3D
::
clearOctree
(){
octree
=
Octree
();
}
float
cv
::
Mesh3D
::
estimateResolution
(
float
tryRatio
)
float
cv
::
Mesh3D
::
estimateResolution
(
float
/*tryRatio*/
)
{
#if 0
const int neighbors = 3;
...
...
modules/core/src/matmul.cpp
View file @
97835a8f
...
...
@@ -2148,7 +2148,7 @@ void cv::calcCovarMatrix( InputArray _data, OutputArray _covar, InputOutputArray
ctype
=
std
::
max
(
std
::
max
(
CV_MAT_DEPTH
(
ctype
>=
0
?
ctype
:
type
),
_mean
.
depth
()),
CV_32F
);
Mat
_data
(
s
rc
.
size
(
),
size
.
area
(),
type
);
Mat
_data
(
s
tatic_cast
<
int
>
(
src
.
size
()
),
size
.
area
(),
type
);
int
i
=
0
;
for
(
vector
<
cv
::
Mat
>::
iterator
each
=
src
.
begin
();
each
!=
src
.
end
();
each
++
,
i
++
)
...
...
modules/core/test/test_math.cpp
View file @
97835a8f
...
...
@@ -2544,7 +2544,7 @@ TEST(CovariationMatrixVectorOfMat, accuracy)
std
::
vector
<
cv
::
Mat
>
srcVec
;
for
(
size_t
i
=
0
;
i
<
vector_size
;
i
++
)
{
srcVec
.
push_back
(
src
.
row
(
i
).
reshape
(
0
,
col_problem_size
));
srcVec
.
push_back
(
src
.
row
(
static_cast
<
int
>
(
i
)
).
reshape
(
0
,
col_problem_size
));
}
cv
::
Mat
actual
;
...
...
@@ -2579,7 +2579,7 @@ TEST(CovariationMatrixVectorOfMatWithMean, accuracy)
std
::
vector
<
cv
::
Mat
>
srcVec
;
for
(
size_t
i
=
0
;
i
<
vector_size
;
i
++
)
{
srcVec
.
push_back
(
src
.
row
(
i
).
reshape
(
0
,
col_problem_size
));
srcVec
.
push_back
(
src
.
row
(
static_cast
<
int
>
(
i
)
).
reshape
(
0
,
col_problem_size
));
}
cv
::
Mat
actual
;
...
...
modules/highgui/src/grfmt_png.cpp
View file @
97835a8f
...
...
@@ -59,6 +59,11 @@
#include <zlib.h>
#include "grfmt_png.hpp"
#if defined _MSC_VER && _MSC_VER >= 1200
// disable warnings related to _setjmp
#pragma warning( disable: 4611 )
#endif
namespace
cv
{
...
...
modules/ml/test/test_emknearestkmeans.cpp
View file @
97835a8f
...
...
@@ -77,9 +77,9 @@ void generateData( Mat& data, Mat& labels, const vector<int>& sizes, const Mat&
int
total
=
0
;
for
(
;
sit
!=
sizes
.
end
();
++
sit
)
total
+=
*
sit
;
a
ssert
(
_means
.
rows
==
(
int
)
sizes
.
size
()
&&
covs
.
size
()
==
sizes
.
size
()
);
a
ssert
(
!
data
.
empty
()
&&
data
.
rows
==
total
);
a
ssert
(
data
.
type
()
==
dataType
);
CV_A
ssert
(
_means
.
rows
==
(
int
)
sizes
.
size
()
&&
covs
.
size
()
==
sizes
.
size
()
);
CV_A
ssert
(
!
data
.
empty
()
&&
data
.
rows
==
total
);
CV_A
ssert
(
data
.
type
()
==
dataType
);
labels
.
create
(
data
.
rows
,
1
,
labelType
);
...
...
modules/video/perf/perf_optflowpyrlk.cpp
View file @
97835a8f
...
...
@@ -22,7 +22,7 @@ void FormTrackingPointsArray(vector<Point2f>& points, int width, int height, int
{
for
(
int
y
=
stepY
/
2
;
y
<
height
;
y
+=
stepY
)
{
Point2f
pt
(
x
,
y
);
Point2f
pt
(
static_cast
<
float
>
(
x
),
static_cast
<
float
>
(
y
)
);
points
.
push_back
(
pt
);
}
}
...
...
modules/videostab/src/precomp.hpp
View file @
97835a8f
...
...
@@ -74,12 +74,12 @@ template <typename T> inline const T& at(int index, const T *items, int size)
template
<
typename
T
>
inline
T
&
at
(
int
index
,
std
::
vector
<
T
>
&
items
)
{
return
at
(
index
,
&
items
[
0
],
items
.
size
(
));
return
at
(
index
,
&
items
[
0
],
static_cast
<
int
>
(
items
.
size
()
));
}
template
<
typename
T
>
inline
const
T
&
at
(
int
index
,
const
std
::
vector
<
T
>
&
items
)
{
return
items
[
cv
::
borderInterpolate
(
index
,
items
.
size
(
),
cv
::
BORDER_WRAP
)];
return
items
[
cv
::
borderInterpolate
(
index
,
static_cast
<
int
>
(
items
.
size
()
),
cv
::
BORDER_WRAP
)];
}
#endif
...
...
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