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

deleted excess semicolons, commas

Browse Source
This commit is contained in:
Ilya Lavrenov
2014-01-18 01:30:29 +04:00
parent e965f3d3d4
commit 37789f015a
68 changed files with 442 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/legacy/src/blobtrackgen1.cpp
View File

@@ -98,7 +98,7 @@ public:
m_pFileName = NULL;
SetModuleName("Gen1");
};
}
~CvBlobTrackGen1()
{
@@ -119,7 +119,7 @@ public:
} /* Check next track. */
} /* Destructor. */
void SetFileName(char* pFileName){m_pFileName = pFileName;};
void SetFileName(char* pFileName){m_pFileName = pFileName;}
void AddBlob(CvBlob* pBlob)
{
@@ -140,7 +140,7 @@ public:
pTrack->FrameLast = m_Frame;
assert(pTrack->pSeq);
pTrack->pSeq->AddBlob(pBlob);
};
}
void Process(IplImage* /*pImg*/ = NULL, IplImage* /*pFG*/ = NULL)
{

6
modules/legacy/src/blobtrackgenyml.cpp
View File

@@ -147,7 +147,7 @@ public:
m_Size = cvSize(2,2);
SetModuleName("YML");
};
}
~CvBlobTrackGenYML()
{
@@ -164,7 +164,7 @@ public:
} /* Destructor. */
void SetFileName(char* pFileName){m_pFileName = pFileName;};
void SetFileName(char* pFileName){m_pFileName = pFileName;}
void AddBlob(CvBlob* pBlob)
{
DefBlobTrack* pTrack = (DefBlobTrack*)m_TrackList.GetBlobByID(CV_BLOB_ID(pBlob));
@@ -184,7 +184,7 @@ public:
pTrack->FrameLast = m_Frame;
assert(pTrack->pSeq);
pTrack->pSeq->AddBlob(pBlob);
};
}
void Process(IplImage* pImg = NULL, IplImage* /*pFG*/ = NULL)
{
int i;

14
modules/legacy/src/blobtrackingauto.cpp
View File

@@ -97,16 +97,16 @@ class CvBlobTrackerAuto1: public CvBlobTrackerAuto
public:
CvBlobTrackerAuto1(CvBlobTrackerAutoParam1* param);
~CvBlobTrackerAuto1();
CvBlob* GetBlob(int index){return m_BlobList.GetBlob(index);};
CvBlob* GetBlobByID(int ID){return m_BlobList.GetBlobByID(ID);};
int GetBlobNum(){return m_BlobList.GetBlobNum();};
virtual IplImage* GetFGMask(){return m_pFGMask;};
float GetState(int BlobID){return m_pBTA?m_pBTA->GetState(BlobID):0;};
const char* GetStateDesc(int BlobID){return m_pBTA?m_pBTA->GetStateDesc(BlobID):NULL;};
CvBlob* GetBlob(int index){return m_BlobList.GetBlob(index);}
CvBlob* GetBlobByID(int ID){return m_BlobList.GetBlobByID(ID);}
int GetBlobNum(){return m_BlobList.GetBlobNum();}
virtual IplImage* GetFGMask(){return m_pFGMask;}
float GetState(int BlobID){return m_pBTA?m_pBTA->GetState(BlobID):0;}
const char* GetStateDesc(int BlobID){return m_pBTA?m_pBTA->GetStateDesc(BlobID):NULL;}
/* Return 0 if trajectory is normal;
return >0 if trajectory abnormal. */
void Process(IplImage* pImg, IplImage* pMask = NULL);
void Release(){delete this;};
void Release(){delete this;}
private:
IplImage* m_pFGMask;

32
modules/legacy/src/blobtrackingcc.cpp
View File

@@ -125,23 +125,23 @@ public:
CommentParam("ConfidenceType","Type of calculated Confidence (NearestBlob, AverFG, BC)");
SetModuleName("CC");
};
}
~CvBlobTrackerCC()
{
if(m_pMem)cvReleaseMemStorage(&m_pMem);
};
}
/* Blob functions: */
virtual int GetBlobNum() {return m_BlobList.GetBlobNum();};
virtual CvBlob* GetBlob(int BlobIndex){return m_BlobList.GetBlob(BlobIndex);};
virtual int GetBlobNum() {return m_BlobList.GetBlobNum();}
virtual CvBlob* GetBlob(int BlobIndex){return m_BlobList.GetBlob(BlobIndex);}
virtual void SetBlob(int BlobIndex, CvBlob* pBlob)
{
CvBlob* pB = m_BlobList.GetBlob(BlobIndex);
if(pB) pB[0] = pBlob[0];
};
}
virtual CvBlob* GetBlobByID(int BlobID){return m_BlobList.GetBlobByID(BlobID);};
virtual CvBlob* GetBlobByID(int BlobID){return m_BlobList.GetBlobByID(BlobID);}
virtual void DelBlob(int BlobIndex)
{
DefBlobTracker* pBT = (DefBlobTracker*)m_BlobList.GetBlob(BlobIndex);
@@ -156,7 +156,7 @@ public:
}
delete pBT->pBlobHyp;
m_BlobList.DelBlob(BlobIndex);
};
}
#if 0
virtual void DelBlobByID(int BlobID)
{
@@ -166,7 +166,7 @@ public:
m_BlobList.DelBlobByID(BlobID);
};
#endif
virtual void Release(){delete this;};
virtual void Release(){delete this;}
/* Add new blob to track it and assign to this blob personal ID */
/* pBlob - pinter to structure with blob parameters (ID is ignored)*/
@@ -185,7 +185,7 @@ public:
NewB.AverFG = pImgFG?CalcAverageMask(pB,pImgFG):0;
m_BlobList.AddBlob((CvBlob*)&NewB);
return m_BlobList.GetBlob(m_BlobList.GetBlobNum()-1);
};
}
virtual void Process(IplImage* pImg, IplImage* pImgFG = NULL)
{
@@ -390,7 +390,7 @@ public:
pBlob[0] = pB[0];
pBlob->ID = ID;
};
}
virtual double GetConfidence(int BlobIndex, CvBlob* pBlob, IplImage* /*pImg*/, IplImage* pImgFG = NULL)
{
@@ -443,7 +443,7 @@ public:
} /* Calculate sum of mask. */
return W;
};
}
virtual void UpdateBlob(int BlobIndex, CvBlob* /*pBlob*/, IplImage* /*pImg*/, IplImage* pImgFG = NULL)
{
@@ -455,7 +455,7 @@ public:
{
//pBT->AverFG = pBT->AverFG * (1-m_Alpha) + m_Alpha * CalcAverageMask(pBlob,pImgFG);
}
};
}
virtual void ParamUpdate()
{
@@ -481,7 +481,7 @@ public:
DefBlobTracker* pBT = (DefBlobTracker*)m_BlobList.GetBlob(BlobIdx);
assert(pBT->pBlobHyp);
return pBT->pBlobHyp->GetBlobNum();
}; /* CvBlobtrackerList::GetBlobHypNum() */
} /* CvBlobtrackerList::GetBlobHypNum() */
/* Return pointer to specified blob hypothesis by index blob: */
virtual CvBlob* GetBlobHyp(int BlobIndex, int hypothesis)
@@ -489,7 +489,7 @@ public:
DefBlobTracker* pBT = (DefBlobTracker*)m_BlobList.GetBlob(BlobIndex);
assert(pBT->pBlobHyp);
return pBT->pBlobHyp->GetBlob(hypothesis);
}; /* CvBlobtrackerList::GetBlobHyp() */
} /* CvBlobtrackerList::GetBlobHyp() */
/* Set new parameters for specified (by index) blob hypothesis
* (can be called several times for each hypothesis):
@@ -512,7 +512,7 @@ public:
assert(pBT->pBlobHyp);
pBT->pBlobHyp->AddBlob(pBlob);
}
};
}
private:
CvBlob* GetNearestBlob(CvBlob* pB)
@@ -542,7 +542,7 @@ private:
return pBBest;
}; /* GetNearestBlob */
} /* GetNearestBlob */
};

22
modules/legacy/src/blobtrackingccwithcr.cpp
View File

@@ -110,23 +110,23 @@ public:
pM->Release();
}
SetParam("SizeVar",0);
};
}
~CvBlobTrackerCCCR()
{
if(m_pMem)cvReleaseMemStorage(&m_pMem);
};
}
/* Blob functions: */
virtual int GetBlobNum() {return m_BlobList.GetBlobNum();};
virtual CvBlob* GetBlob(int BlobIndex){return m_BlobList.GetBlob(BlobIndex);};
virtual int GetBlobNum() {return m_BlobList.GetBlobNum();}
virtual CvBlob* GetBlob(int BlobIndex){return m_BlobList.GetBlob(BlobIndex);}
virtual void SetBlob(int BlobIndex, CvBlob* pBlob)
{
CvBlob* pB = m_BlobList.GetBlob(BlobIndex);
if(pB) pB[0] = pBlob[0];
};
}
virtual CvBlob* GetBlobByID(int BlobID){return m_BlobList.GetBlobByID(BlobID);};
virtual CvBlob* GetBlobByID(int BlobID){return m_BlobList.GetBlobByID(BlobID);}
virtual void DelBlob(int BlobIndex)
{
DefBlobTrackerCR* pBT = (DefBlobTrackerCR*)m_BlobList.GetBlob(BlobIndex);
@@ -134,7 +134,7 @@ public:
if(pBT->pPredictor)pBT->pPredictor->Release();
delete pBT->pBlobHyp;
m_BlobList.DelBlob(BlobIndex);
};
}
virtual void DelBlobByID(int BlobID)
{
@@ -143,9 +143,9 @@ public:
if(pBT->pPredictor)pBT->pPredictor->Release();
delete pBT->pBlobHyp;
m_BlobList.DelBlobByID(BlobID);
};
}
virtual void Release(){delete this;};
virtual void Release(){delete this;}
/* Add new blob to track it and assign to this blob personal ID */
/* pBlob - pinter to structure with blob parameters (ID is ignored)*/
@@ -169,7 +169,7 @@ public:
}
m_BlobList.AddBlob((CvBlob*)&NewB);
return m_BlobList.GetBlob(m_BlobList.GetBlobNum()-1);
};
}
virtual void Process(IplImage* pImg, IplImage* pImgFG = NULL)
{
@@ -480,7 +480,7 @@ public:
} /* Read next blob. */
} /* CCwithCR LoadState */
//void SetCollision(int Collision){m_Collision = Collision;};
//void SetCollision(int Collision){m_Collision = Collision;}
};
CvBlobTrackerOne* cvCreateBlobTrackerOneMSPF();

26
modules/legacy/src/blobtrackinglist.cpp
View File

@@ -228,7 +228,7 @@ public:
{
m_BlobTrackerList.DelBlob(i-1);
}
};
}
CvBlob* AddBlob(CvBlob* pBlob, IplImage* pImg, IplImage* pImgFG )
{ /* Create new tracker: */
@@ -244,7 +244,7 @@ public:
F.pTracker->Init(pBlob,pImg, pImgFG);
m_BlobTrackerList.AddBlob((CvBlob*)&F);
return m_BlobTrackerList.GetBlob(m_BlobTrackerList.GetBlobNum()-1);
};
}
void DelBlob(int BlobIndex)
{
@@ -404,7 +404,7 @@ public:
} /* Update predictor. */
#endif
m_ClearHyp = 1;
};
}
/* Process on blob (for multi hypothesis tracing) */
@@ -421,7 +421,7 @@ public:
pBlob[0] = pF->blob;
}
pBlob->ID = ID;
};
}
virtual double GetConfidence(int BlobIndex, CvBlob* pBlob, IplImage* pImg, IplImage* pImgFG = NULL)
{
@@ -429,7 +429,7 @@ public:
if(pF==NULL) return 0;
if(pF->pTracker==NULL) return 0;
return pF->pTracker->GetConfidence(pBlob?pBlob:(&pF->blob), pImg, pImgFG, NULL);
};
}
virtual double GetConfidenceList(CvBlobSeq* pBlobList, IplImage* pImg, IplImage* pImgFG = NULL)
{
@@ -460,7 +460,7 @@ public:
// cvWaitKey(0);
}
return W;
};
}
virtual void UpdateBlob(int BlobIndex, CvBlob* pBlob, IplImage* pImg, IplImage* /*pImgFG*/ = NULL)
{
@@ -469,10 +469,10 @@ public:
{
pF->pTracker->Update(pBlob?pBlob:&(pF->blob),pImg,m_pImgFG);
}
};
}
int GetBlobNum(){return m_BlobTrackerList.GetBlobNum();};
CvBlob* GetBlob(int index){return m_BlobTrackerList.GetBlob(index);};
int GetBlobNum(){return m_BlobTrackerList.GetBlobNum();}
CvBlob* GetBlob(int index){return m_BlobTrackerList.GetBlob(index);}
void SetBlob(int BlobIndex, CvBlob* pBlob)
{
@@ -485,7 +485,7 @@ public:
}
}
void Release(){delete this;};
void Release(){delete this;}
/* Additional functionality: */
CvBlob* GetBlobByID(int BlobID){return m_BlobTrackerList.GetBlobByID(BlobID);}
@@ -497,7 +497,7 @@ public:
DefBlobTrackerL* pF = (DefBlobTrackerL*)m_BlobTrackerList.GetBlob(BlobIdx);
assert(pF->pBlobHyp);
return pF->pBlobHyp->GetBlobNum();
}; /* CvBlobtrackerList::GetBlobHypNum() */
} /* CvBlobtrackerList::GetBlobHypNum() */
/* Return pointer to specified blob hypothesis by index blob: */
virtual CvBlob* GetBlobHyp(int BlobIndex, int hypothesis)
@@ -505,7 +505,7 @@ public:
DefBlobTrackerL* pF = (DefBlobTrackerL*)m_BlobTrackerList.GetBlob(BlobIndex);
assert(pF->pBlobHyp);
return pF->pBlobHyp->GetBlob(hypothesis);
}; /* CvBlobtrackerList::GetBlobHyp() */
} /* CvBlobtrackerList::GetBlobHyp() */
/* Set new parameters for specified (by index) blob hyp (can be called several times for each hyp )*/
virtual void SetBlobHyp(int BlobIndex, CvBlob* pBlob)
@@ -526,7 +526,7 @@ public:
assert(pF->pBlobHyp);
pF->pBlobHyp->AddBlob(pBlob);
}
}; /* CvBlobtrackerList::SetBlobHyp */
} /* CvBlobtrackerList::SetBlobHyp */
private:
public:

22
modules/legacy/src/blobtrackingmsfg.cpp
View File

@@ -260,7 +260,7 @@ private:
pHist->m_HistVolume = Volume;
}; /* CollectHist */
} /* CollectHist */
double calcBhattacharyya(DefHist* pHM = NULL, DefHist* pHC = NULL, DefHist* pHT = NULL)
{
@@ -370,7 +370,7 @@ public:
if(pImg)
CollectHist(pImg, pImgFG, pBlobInit, &m_HistModel);
m_Blob = pBlobInit[0];
};
}
virtual CvBlob* Process(CvBlob* pBlobPrev, IplImage* pImg, IplImage* pImgFG = NULL)
{
@@ -603,7 +603,7 @@ public:
return &m_Blob;
}; /* CvBlobTrackerOneMSFG::Process */
} /* CvBlobTrackerOneMSFG::Process */
virtual double GetConfidence(CvBlob* pBlob, IplImage* pImg, IplImage* /*pImgFG*/ = NULL, IplImage* pImgUnusedReg = NULL)
{
@@ -611,14 +611,14 @@ public:
double B = GetBhattacharyya(pImg, pImgUnusedReg, pBlob, &m_HistTemp);
return exp((B-1)/(2*S));
}; /*CvBlobTrackerOneMSFG::*/
} /*CvBlobTrackerOneMSFG::*/
virtual void Update(CvBlob* pBlob, IplImage* pImg, IplImage* pImgFG = NULL)
{ /* Update histogram: */
UpdateModelHist(pImg, pImgFG, pBlob?pBlob:&m_Blob);
} /*CvBlobTrackerOneMSFG::*/
virtual void Release(){delete this;};
virtual void Release(){delete this;}
virtual void SetCollision(int CollisionFlag)
{
m_Collision = CollisionFlag;
@@ -629,7 +629,7 @@ public:
cvWriteInt(fs,"Collision", m_Collision);
cvWriteInt(fs,"HistVolume", cvRound(m_HistModel.m_HistVolume));
cvWrite(fs,"Hist", m_HistModel.m_pHist);
};
}
virtual void LoadState(CvFileStorage* fs, CvFileNode* node)
{
CvMat* pM;
@@ -641,7 +641,7 @@ public:
m_HistModel.m_pHist = pM;
m_HistModel.m_HistVolume = (float)cvSum(pM).val[0];
}
};
}
}; /*CvBlobTrackerOneMSFG*/
@@ -782,7 +782,7 @@ public:
cvWriteInt(fs,"ParticleNum",m_ParticleNum);
cvWriteStruct(fs,"ParticlesPredicted",m_pParticlesPredicted,"ffffiffd",m_ParticleNum);
cvWriteStruct(fs,"ParticlesResampled",m_pParticlesResampled,"ffffiffd",m_ParticleNum);
};
}
virtual void LoadState(CvFileStorage* fs, CvFileNode* node)
{
@@ -796,7 +796,7 @@ public:
cvReadStructByName(fs,node,"ParticlesPredicted",m_pParticlesPredicted,"ffffiffd");
cvReadStructByName(fs,node,"ParticlesResampled",m_pParticlesResampled,"ffffiffd");
}
};
}
CvBlobTrackerOneMSPF()
{
m_pParticlesPredicted = NULL;
@@ -847,7 +847,7 @@ private:
if(m_pParticlesPredicted)cvFree(&m_pParticlesPredicted);
m_pParticlesPredicted = (DefParticle*)cvAlloc(sizeof(DefParticle)*m_ParticleNum);
m_pParticlesResampled = (DefParticle*)cvAlloc(sizeof(DefParticle)*m_ParticleNum);
}; /* Realloc*/
} /* Realloc*/
void DrawDebug(IplImage* pImg, IplImage* /*pImgFG*/)
{
@@ -1161,7 +1161,7 @@ public:
}
}
virtual void Release(){delete this;};
virtual void Release(){delete this;}
virtual void ParamUpdate()
{
Realloc();

6
modules/legacy/src/blobtrackingmsfgs.cpp
View File

@@ -210,7 +210,7 @@ private:
if(pHistVolume)pHistVolume[0] = Volume;
}; /* calcHist */
} /* calcHist */
double calcBhattacharyya()
{
@@ -440,9 +440,9 @@ public:
return &m_Blob;
}; /* Process */
} /* Process */
virtual void Release(){delete this;};
virtual void Release(){delete this;}
}; /*CvBlobTrackerOneMSFGS*/
static CvBlobTrackerOne* cvCreateBlobTrackerOneMSFGS()

12
modules/legacy/src/blobtrackpostproclist.cpp
View File

@@ -74,7 +74,7 @@ public:
DefBlobFilter* pF = (DefBlobFilter*)m_BlobFilterList.GetBlob(i-1);
pF->pFilter->Release();
}
};
}
virtual void AddBlob(CvBlob* pBlob)
{
@@ -93,7 +93,7 @@ public:
assert(pF);
pF->blob = pBlob[0];
pF->m_LastFrame = m_Frame;
};
}
virtual void Process()
{
@@ -115,11 +115,11 @@ public:
}
} /* Next blob. */
m_Frame++;
};
}
int GetBlobNum(){return m_BlobFilterList.GetBlobNum();};
CvBlob* GetBlob(int index){return m_BlobFilterList.GetBlob(index);};
void Release(){delete this;};
int GetBlobNum(){return m_BlobFilterList.GetBlobNum();}
CvBlob* GetBlob(int index){return m_BlobFilterList.GetBlob(index);}
void Release(){delete this;}
/* Additional functionality: */
CvBlob* GetBlobByID(int BlobID){return m_BlobFilterList.GetBlobByID(BlobID);}

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

@@ -544,7 +544,7 @@ public:
CvBlobDetectorCC();
~CvBlobDetectorCC();
int DetectNewBlob(IplImage* pImg, IplImage* pFGMask, CvBlobSeq* pNewBlobList, CvBlobSeq* pOldBlobList);
void Release(){delete this;};
void Release(){delete this;}
virtual void ParamUpdate()
{

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

@@ -156,7 +156,7 @@ public:
} /* cvDetectNewBlob */
void Release(){delete this;};
void Release(){delete this;}
};
/* Blob detector constructor: */

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

@@ -98,7 +98,7 @@ inline void FaceFeature::SetWeight(double dWeight)
class FaceTemplate
{
public:
FaceTemplate(long lFeatureCount) {m_lFeturesCount = lFeatureCount; m_lpFeaturesList = new FaceFeature[lFeatureCount];};
FaceTemplate(long lFeatureCount) {m_lFeturesCount = lFeatureCount; m_lpFeaturesList = new FaceFeature[lFeatureCount];}
virtual ~FaceTemplate();
inline long GetCount();

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

@@ -57,8 +57,8 @@ namespace cv{
cvCopy(translation, m_translation);
};
CvMat* GetRotation() {return m_rotation;};
CvMat* GetTranslation() {return m_translation;};
CvMat* GetRotation() {return m_rotation;}
CvMat* GetTranslation() {return m_translation;}
protected:
CvMat* m_rotation;