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

added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-07-19 12:27:07 +00:00
parent 6bb1c07fd4
commit ff5e97c8e4
48 changed files with 443 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/objdetect/src/cascadedetect.cpp
View File

@@ -173,7 +173,7 @@ public:
densityKernel = densKer;
weightsV = wV;
positionsV = posV;
positionsCount = posV.size();
positionsCount = (int)posV.size();
meanshiftV.resize(positionsCount);
distanceV.resize(positionsCount);
modeEps = modeEps;
@@ -316,7 +316,7 @@ protected:
static void groupRectangles_meanshift(vector<Rect>& rectList, double detectThreshold, vector<double>* foundWeights,
vector<double>& scales, Size winDetSize)
{
int detectionCount = rectList.size();
int detectionCount = (int)rectList.size();
vector<Point3d> hits(detectionCount), resultHits;
vector<double> hitWeights(detectionCount), resultWeights;
Point2d hitCenter;
@@ -1080,7 +1080,7 @@ struct CascadeClassifierInvoker
if( rejectLevels )
{
if( result == 1 )
result = -1*classifier->data.stages.size();
result = -(int)classifier->data.stages.size();
if( classifier->data.stages.size() + result < 4 )
{
rectangles->push_back(Rect(cvRound(x*scalingFactor), cvRound(y*scalingFactor), winSize.width, winSize.height));

4
modules/objdetect/src/datamatrix.cpp
View File

@@ -191,6 +191,7 @@ CvMat *Sampler::extract()
return r;
}
#if CV_SSE2
static void apron(CvMat *v)
{
int r = v->rows;
@@ -331,11 +332,12 @@ static deque<CvPoint> trailto(CvMat *v, int x, int y, CvMat *terminal)
y += yd;
}
int l = r.size() * 9 / 10;
int l = (int)(r.size() * 9 / 10);
while (l--)
r.pop_front();
return r;
}
#endif
deque <CvDataMatrixCode> cvFindDataMatrix(CvMat *im)
{

4
modules/objdetect/src/latentsvm.cpp
View File

@@ -508,11 +508,11 @@ int getMaxFilterDims(const CvLSVMFilterObject **filters, int kComponents,
componentIndex = kPartFilters[0] + 1;
for (i = 1; i < kComponents; i++)
{
if (filters[componentIndex]->sizeX > *maxXBorder)
if ((unsigned)filters[componentIndex]->sizeX > *maxXBorder)
{
*maxXBorder = filters[componentIndex]->sizeX;
}
if (filters[componentIndex]->sizeY > *maxYBorder)
if ((unsigned)filters[componentIndex]->sizeY > *maxYBorder)
{
*maxYBorder = filters[componentIndex]->sizeY;
}

3
modules/objdetect/src/matching.cpp
View File

@@ -202,8 +202,7 @@ int getFFTImageFilterObject(const CvLSVMFilterObject *filter,
int mapDimX, int mapDimY,
CvLSVMFftImage **image)
{
unsigned int i, mapSize, filterSize;
int res;
int i, mapSize, filterSize, res;
float *newFilter, *rot2PIFilter;
filterSize = filter->sizeX * filter->sizeY;