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

fixed #1549 issue

Browse Source
This commit is contained in:
Alexander Shishkov 2012-02-06 13:26:35 +00:00
parent c19d0b17de
commit 792fb3bd64
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,29 +296,29 @@ private:
}; };
class ListElem class FaceDetectionListElem
{ {
public: public:
ListElem(); FaceDetectionListElem();
ListElem(Face * pFace,ListElem * pHead); FaceDetectionListElem(Face * pFace,FaceDetectionListElem * pHead);
virtual ~ListElem(); virtual ~FaceDetectionListElem();
ListElem * m_pNext; FaceDetectionListElem * m_pNext;
ListElem * m_pPrev; FaceDetectionListElem * m_pPrev;
Face * m_pFace; Face * m_pFace;
};//class ListElem };//class FaceDetectionListElem
class List class FaceDetectionList
{ {
public: public:
List(); FaceDetectionList();
int AddElem(Face * pFace); int AddElem(Face * pFace);
virtual ~List(); virtual ~FaceDetectionList();
Face* GetData(); Face* GetData();
long m_FacesCount; long m_FacesCount;
private: private:
ListElem * m_pHead; FaceDetectionListElem * m_pHead;
ListElem * m_pCurElem; FaceDetectionListElem * m_pCurElem;
};//class List };//class FaceDetectionList
class FaceDetection class FaceDetection
@ -341,7 +341,7 @@ protected:
CvSeq* m_seqRects; CvSeq* m_seqRects;
bool m_bBoosting; bool m_bBoosting;
List * m_pFaceList; FaceDetectionList * m_pFaceList;
protected: protected:
void ResetImage(); void ResetImage();

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

@ -66,7 +66,7 @@ FaceDetection::FaceDetection()
m_seqRects = NULL; m_seqRects = NULL;
m_iNumLayers = 16; m_iNumLayers = 16;
assert(m_iNumLayers <= MAX_LAYERS); assert(m_iNumLayers <= MAX_LAYERS);
m_pFaceList = new List(); m_pFaceList = new FaceDetectionList();
@ -241,7 +241,7 @@ void FaceDetection::CreateResults(CvSeq * lpSeq)
void FaceDetection::ResetImage() void FaceDetection::ResetImage()
{ {
delete m_pFaceList; delete m_pFaceList;
m_pFaceList = new List(); m_pFaceList = new FaceDetectionList();
}//FaceDetection::ResetImage }//FaceDetection::ResetImage
@ -424,16 +424,16 @@ void FaceDetection::PostBoostingFindCandidats(IplImage * FaceImage)
////// //////
//List Class //FaceDetectionList Class
///// /////
ListElem::ListElem() FaceDetectionListElem::FaceDetectionListElem()
{ {
m_pNext = this; m_pNext = this;
m_pPrev = this; m_pPrev = this;
m_pFace = NULL; m_pFace = NULL;
}///ListElem::ListElem() }///FaceDetectionListElem::FaceDetectionListElem()
ListElem::ListElem(Face * pFace,ListElem * pHead) FaceDetectionListElem::FaceDetectionListElem(Face * pFace,FaceDetectionListElem * pHead)
{ {
m_pNext = pHead; m_pNext = pHead;
m_pPrev = pHead->m_pPrev; m_pPrev = pHead->m_pPrev;
@ -441,26 +441,26 @@ ListElem::ListElem(Face * pFace,ListElem * pHead)
pHead->m_pPrev = this; pHead->m_pPrev = this;
m_pFace = pFace; m_pFace = pFace;
}//ListElem::ListElem(Face * pFace) }//FaceDetectionListElem::FaceDetectionListElem(Face * pFace)
ListElem::~ListElem() FaceDetectionListElem::~FaceDetectionListElem()
{ {
delete m_pFace; delete m_pFace;
m_pNext->m_pPrev = m_pPrev; m_pNext->m_pPrev = m_pPrev;
m_pPrev->m_pNext = m_pNext; m_pPrev->m_pNext = m_pNext;
}//ListElem::~ListElem() }//FaceDetectionListElem::~FaceDetectionListElem()
List::List() FaceDetectionList::FaceDetectionList()
{ {
m_pHead = new ListElem(); m_pHead = new FaceDetectionListElem();
m_FacesCount = 0; m_FacesCount = 0;
m_pCurElem = m_pHead; m_pCurElem = m_pHead;
}//List::List() }//FaceDetectionList::FaceDetectionList()
List::~List() FaceDetectionList::~FaceDetectionList()
{ {
void * tmp; void * tmp;
while((tmp = m_pHead->m_pNext->m_pFace) != 0) while((tmp = m_pHead->m_pNext->m_pFace) != 0)
@ -468,19 +468,19 @@ List::~List()
delete m_pHead; delete m_pHead;
}//List::~List() }//FaceDetectionList::~FaceDetectionList()
int List::AddElem(Face * pFace) int FaceDetectionList::AddElem(Face * pFace)
{ {
new ListElem(pFace,m_pHead); new FaceDetectionListElem(pFace,m_pHead);
return m_FacesCount++; return m_FacesCount++;
}//List::AddElem(Face * pFace) }//FaceDetectionList::AddElem(Face * pFace)
Face * List::GetData() Face * FaceDetectionList::GetData()
{ {
m_pCurElem = m_pCurElem->m_pNext; m_pCurElem = m_pCurElem->m_pNext;
return m_pCurElem->m_pFace; return m_pCurElem->m_pFace;
}//Face * List::GetData() }//Face * FaceDetectionList::GetData()