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

8
modules/legacy/src/_facedetection.h
View File

@@ -364,7 +364,7 @@ inline void ReallocImage(IplImage** ppImage, CvSize sz, long lChNum)
cvReleaseImage( &pImage );
}
if( pImage == NULL )
pImage = cvCreateImage( sz, IPL_DEPTH_8U, lChNum);
pImage = cvCreateImage( sz, IPL_DEPTH_8U, (int)lChNum);
*ppImage = pImage;
}
@@ -385,9 +385,9 @@ inline BoostingFaceTemplate::BoostingFaceTemplate(long lNumber,CvRect rect):Face
long EyeWidth = rect.width/5;
long EyeHeight = EyeWidth;
CvRect LeftEyeRect = cvRect(rect.x + EyeWidth,rect.y + rect.height/2 - EyeHeight,EyeWidth,EyeHeight);
CvRect RightEyeRect = cvRect(rect.x + 3*EyeWidth,rect.y + rect.height/2 - EyeHeight,EyeWidth,EyeHeight);
CvRect MouthRect = cvRect(rect.x + 3*EyeWidth/2,rect.y + 3*rect.height/4 - EyeHeight/2,2*EyeWidth,EyeHeight);
CvRect LeftEyeRect = cvRect((int)(rect.x + EyeWidth),(int)(rect.y + rect.height/2 - EyeHeight),(int)EyeWidth,(int)EyeHeight);
CvRect RightEyeRect = cvRect((int)(rect.x + 3*EyeWidth),(int)(rect.y + rect.height/2 - EyeHeight),(int)EyeWidth,(int)EyeHeight);
CvRect MouthRect = cvRect((int)(rect.x + 3*EyeWidth/2),(int)(rect.y + 3*rect.height/4 - EyeHeight/2),(int)(2*EyeWidth),(int)EyeHeight);
CvRect * lpMouthRect = new CvRect();
*lpMouthRect = MouthRect;

2
modules/legacy/src/_vectrack.h
View File

@@ -156,7 +156,7 @@ inline void ReallocImage(IplImage** ppImage, CvSize sz, long lChNum)
cvReleaseImage( &pImage );
}
if( pImage == NULL )
pImage = cvCreateImage( sz, IPL_DEPTH_8U, lChNum);
pImage = cvCreateImage( sz, IPL_DEPTH_8U, (int)lChNum);
*ppImage = pImage;
}

5
modules/legacy/src/blobtrackanalysishist.cpp
View File

@@ -63,10 +63,8 @@ private:
float m_FVMin[MAX_FV_SIZE];
float m_FVVar[MAX_FV_SIZE];
int m_Dim;
CvBlob m_BlobSeq[BLOB_NUM];
int m_Frame;
int m_State;
int m_LastFrame;
int m_ClearFlag;
void Clear()
{
@@ -251,10 +249,8 @@ private:
float m_FVMin[MAX_FV_SIZE];
float m_FVVar[MAX_FV_SIZE];
int m_Dim;
CvBlob m_BlobSeq[BLOB_NUM];
int m_Frame;
int m_State;
int m_LastFrame;
int m_ClearFlag;
void Clear()
{
@@ -1132,7 +1128,6 @@ class CvBlobTrackAnalysisSVM : public CvBlobTrackAnalysis
{
/*---------------- Internal functions: --------------------*/
private:
CvMemStorage* m_pMem;
int m_TrackNum;
int m_Frame;
char m_DataFileName[1024];

9
modules/legacy/src/blobtrackpostprockalman.cpp
View File

@@ -44,6 +44,7 @@
/* State vector is (x,y,w,h,dx,dy,dw,dh). */
/* Measurement is (x,y,w,h). */
#if 0
/* Dynamic matrix A: */
const float A8[] = { 1, 0, 0, 0, 1, 0, 0, 0,
0, 1, 0, 0, 0, 1, 0, 0,
@@ -60,6 +61,12 @@ const float H8[] = { 1, 0, 0, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0, 0, 0,
0, 0, 0, 1, 0, 0, 0, 0};
#define STATE_NUM 8
#define A A8
#define H H8
#else
/* Matrices for zero size velocity: */
/* Dinamic matrix A: */
const float A6[] = { 1, 0, 0, 0, 1, 0,
@@ -79,6 +86,8 @@ const float H6[] = { 1, 0, 0, 0, 0, 0,
#define A A6
#define H H6
#endif
class CvBlobTrackPostProcKalman:public CvBlobTrackPostProcOne
{

4
modules/legacy/src/enteringblobdetection.cpp
View File

@@ -588,7 +588,9 @@ private:
float m_param_roi_scale;
int m_param_only_roi;
#ifdef USE_OBJECT_DETECTOR
CvObjectDetector* m_split_detector;
#endif
CvSize m_min_window_size;
int m_max_border;
@@ -603,7 +605,9 @@ CvBlobDetector* cvCreateBlobDetectorCC(){return new CvBlobDetectorCC;}
/* Constructor for BlobDetector: */
CvBlobDetectorCC::CvBlobDetectorCC() :
#ifdef USE_OBJECT_DETECTOR
m_split_detector(0),
#endif
m_detected_blob_seq(sizeof(CvDetectedBlob)),
m_roi_seq(0),
m_debug_blob_seq(sizeof(CvDetectedBlob))

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

2
modules/legacy/src/facedetection.cpp
View File

@@ -491,7 +491,7 @@ FaceDetectionList::~FaceDetectionList()
int FaceDetectionList::AddElem(Face * pFace)
{
new FaceDetectionListElem(pFace,m_pHead);
return m_FacesCount++;
return (int)m_FacesCount++;
}//FaceDetectionList::AddElem(Face * pFace)
Face * FaceDetectionList::GetData()