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

fixed build errors & warnings on VS2010

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-03-25 22:05:58 +00:00
parent 8991d323ea
commit 5777689fe9
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/contrib/src/colormap.cpp
View File

@@ -18,13 +18,17 @@
#include "precomp.hpp" #include "precomp.hpp"
#include <iostream> #include <iostream>
#if defined _MSC_VER && _MSC_VER >= 1400
#pragma warning( disable: 4305 )
#endif
namespace cv namespace cv
{ {
static Mat linspace(float x0, float x1, int n) static Mat linspace(float x0, float x1, int n)
{ {
Mat pts(n, 1, CV_32FC1); Mat pts(n, 1, CV_32FC1);
float step = (x1-x0)/floor(n-1); float step = (x1-x0)/(n-1);
for(int i = 0; i < n; i++) for(int i = 0; i < n; i++)
pts.at<float>(i,0) = x0+i*step; pts.at<float>(i,0) = x0+i*step;
return pts; return pts;

6
modules/contrib/src/facerec.cpp
View File

@@ -57,7 +57,7 @@ static Mat asRowMatrix(InputArrayOfArrays src, int rtype, double alpha=1, double
if(n == 0) if(n == 0)
return Mat(); return Mat();
// dimensionality of samples // dimensionality of samples
int d = src.getMat(0).total(); int d = (int)src.getMat(0).total();
// create data matrix // create data matrix
Mat data(n, d, rtype); Mat data(n, d, rtype);
// copy data // copy data
@@ -588,8 +588,8 @@ static Mat spatial_histogram(InputArray _src, int numPatterns,
{ {
Mat src = _src.getMat(); Mat src = _src.getMat();
// calculate LBP patch size // calculate LBP patch size
int width = static_cast<int>(floor(src.cols/grid_x)); int width = src.cols/grid_x;
int height = static_cast<int>(floor(src.rows/grid_y)); int height = src.rows/grid_y;
// allocate memory for the spatial histogram // allocate memory for the spatial histogram
Mat result = Mat::zeros(grid_x * grid_y, numPatterns, CV_32FC1); Mat result = Mat::zeros(grid_x * grid_y, numPatterns, CV_32FC1);
// return matrix with zeros if no data was given // return matrix with zeros if no data was given