Merged the trunk r8589:8653 - all changes related to build warnings
This commit is contained in:
@@ -74,9 +74,9 @@ public:
|
||||
{
|
||||
float WSum = 0;
|
||||
int i;
|
||||
int index = m_Frame % TIME_WND;
|
||||
int idx = m_Frame % TIME_WND;
|
||||
int size = MIN((m_Frame+1), TIME_WND);
|
||||
m_pBlobs[index] = pBlob[0];
|
||||
m_pBlobs[idx] = pBlob[0];
|
||||
m_Blob.x = m_Blob.y = m_Blob.w = m_Blob.h = 0;
|
||||
|
||||
for(i=0; i<size; ++i)
|
||||
@@ -106,12 +106,12 @@ public:
|
||||
}
|
||||
}; /* class CvBlobTrackPostProcTimeAver */
|
||||
|
||||
CvBlobTrackPostProcOne* cvCreateModuleBlobTrackPostProcTimeAverRectOne()
|
||||
static CvBlobTrackPostProcOne* cvCreateModuleBlobTrackPostProcTimeAverRectOne()
|
||||
{
|
||||
return (CvBlobTrackPostProcOne*) new CvBlobTrackPostProcTimeAver(0);
|
||||
}
|
||||
|
||||
CvBlobTrackPostProcOne* cvCreateModuleBlobTrackPostProcTimeAverExpOne()
|
||||
static CvBlobTrackPostProcOne* cvCreateModuleBlobTrackPostProcTimeAverExpOne()
|
||||
{
|
||||
return (CvBlobTrackPostProcOne*) new CvBlobTrackPostProcTimeAver(1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user