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

Fixed 9 more build warnings

Browse Source
This commit is contained in:
Andrey Kamaev 2012-04-12 16:21:08 +00:00
parent 3b3d1a86ae
commit 97835a8f32
7 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/contrib/src/spinimages.cpp
View File

@ -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;

2
modules/core/src/matmul.cpp
View File

@ -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(src.size(), size.area(), type);
Mat _data(static_cast<int>(src.size()), size.area(), type);
int i = 0;
for(vector<cv::Mat>::iterator each = src.begin(); each != src.end(); each++, i++ )

4
modules/core/test/test_math.cpp
View File

@ -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;

5
modules/highgui/src/grfmt_png.cpp
View File

@ -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
{

6
modules/ml/test/test_emknearestkmeans.cpp
View File

@ -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;
assert( _means.rows == (int)sizes.size() && covs.size() == sizes.size() );
assert( !data.empty() && data.rows == total );
assert( data.type() == dataType );
CV_Assert( _means.rows == (int)sizes.size() && covs.size() == sizes.size() );
CV_Assert( !data.empty() && data.rows == total );
CV_Assert( data.type() == dataType );
labels.create( data.rows, 1, labelType );

2
modules/video/perf/perf_optflowpyrlk.cpp
View File

@ -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);
}
}

4
modules/videostab/src/precomp.hpp
View File

@ -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