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

Fixed iOS framework compilation warnings

Browse Source
This commit is contained in:
Maksim Shabunin
2014-10-20 16:06:32 +04:00
parent b59aaae2dc
commit 09fb7512ed
35 changed files with 121 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/legacy/src/face.cpp
View File

@@ -154,7 +154,7 @@ bool RFace::CheckElem(void * lpCandidat,void * lpIdeal)
long x = Rect.x + cvRound(Rect.width/2);
long y = Rect.y + cvRound(Rect.height/2);
if ( isPointInRect(cvPoint(x,y),IdealRect) )
if ( isPointInRect(cvPoint((int)x,(int)y),IdealRect) )
return true;
// if ( isPointInRect(cvPoint(Rect.x,Rect.y),UpRect) &&
@@ -329,24 +329,24 @@ inline void RFace::ResizeRect(CvRect Rect,CvRect * lpRect,long lDir,long lD)
{
if (lDir == UP_SCALE)
{
lpRect->x = Rect.x - lD;
lpRect->y = Rect.y - lD;
lpRect->width = Rect.width + 2*lD;
lpRect->height = Rect.height + 2*lD;
lpRect->x = Rect.x - (int)lD;
lpRect->y = Rect.y - (int)lD;
lpRect->width = Rect.width + (int)(2*lD);
lpRect->height = Rect.height + (int)(2*lD);
}
if (lDir == DOWN_SCALE)
{
lpRect->x = Rect.x + lD;
lpRect->y = Rect.y + lD;
lpRect->x = Rect.x + (int)lD;
lpRect->y = Rect.y + (int)lD;
if (Rect.width - 2*lD >= 0)
{
lpRect->width = Rect.width - 2*lD;
lpRect->width = Rect.width - (int)(2*lD);
}else
lpRect->width = 0;
if (Rect.height - 2*lD >= 0)
{
lpRect->height = Rect.height - 2*lD;
lpRect->height = Rect.height - (int)(2*lD);
}else
lpRect->height = 0;
}