From 792fb3bd64b3e1a8b470ed35b5a6c0545b4137cc Mon Sep 17 00:00:00 2001
From: Alexander Shishkov <no@email>
Date: Mon, 6 Feb 2012 13:26:35 +0000
Subject: [PATCH] fixed #1549 issue

---
 modules/legacy/src/_facedetection.h  | 28 ++++++++++----------
 modules/legacy/src/facedetection.cpp | 38 ++++++++++++++--------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/modules/legacy/src/_facedetection.h b/modules/legacy/src/_facedetection.h
index 8c41be4f1..c980ad76d 100644
--- a/modules/legacy/src/_facedetection.h
+++ b/modules/legacy/src/_facedetection.h
@@ -296,29 +296,29 @@ private:
 }; 
 
 
-class ListElem
+class FaceDetectionListElem
 {
 public:
-    ListElem();
-    ListElem(Face * pFace,ListElem * pHead);
-    virtual ~ListElem();
-    ListElem * m_pNext;
-    ListElem * m_pPrev;
+    FaceDetectionListElem();
+    FaceDetectionListElem(Face * pFace,FaceDetectionListElem * pHead);
+    virtual ~FaceDetectionListElem();
+    FaceDetectionListElem * m_pNext;
+    FaceDetectionListElem * m_pPrev;
     Face * m_pFace;
-};//class ListElem
+};//class FaceDetectionListElem
 
-class List
+class FaceDetectionList
 {
 public:
-    List();
+    FaceDetectionList();
     int AddElem(Face * pFace);
-    virtual ~List();
+    virtual ~FaceDetectionList();
     Face* GetData();
         long m_FacesCount;
 private:
-    ListElem * m_pHead;
-    ListElem * m_pCurElem;
-};//class List
+    FaceDetectionListElem * m_pHead;
+    FaceDetectionListElem * m_pCurElem;
+};//class FaceDetectionList
 
 
 class FaceDetection  
@@ -341,7 +341,7 @@ protected:
     CvSeq* m_seqRects;
     
     bool m_bBoosting;
-    List * m_pFaceList;
+    FaceDetectionList * m_pFaceList;
 
 protected:
     void ResetImage();
diff --git a/modules/legacy/src/facedetection.cpp b/modules/legacy/src/facedetection.cpp
index 379dc1c79..349058eaa 100644
--- a/modules/legacy/src/facedetection.cpp
+++ b/modules/legacy/src/facedetection.cpp
@@ -66,7 +66,7 @@ FaceDetection::FaceDetection()
     m_seqRects = NULL;
     m_iNumLayers = 16;
     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()
 {
         delete m_pFaceList;
-        m_pFaceList = new List();
+        m_pFaceList = new FaceDetectionList();
 
 }//FaceDetection::ResetImage
 
@@ -424,16 +424,16 @@ void FaceDetection::PostBoostingFindCandidats(IplImage * FaceImage)
 
 
 //////
-//List Class
+//FaceDetectionList Class
 /////
-ListElem::ListElem()
+FaceDetectionListElem::FaceDetectionListElem()
 {
     m_pNext = this;
     m_pPrev = this;
     m_pFace = NULL;
-}///ListElem::ListElem()
+}///FaceDetectionListElem::FaceDetectionListElem()
 
-ListElem::ListElem(Face * pFace,ListElem * pHead)
+FaceDetectionListElem::FaceDetectionListElem(Face * pFace,FaceDetectionListElem * pHead)
 {
     m_pNext = pHead;
     m_pPrev = pHead->m_pPrev;
@@ -441,26 +441,26 @@ ListElem::ListElem(Face * pFace,ListElem * pHead)
     pHead->m_pPrev = this;
 
     m_pFace = pFace;
-}//ListElem::ListElem(Face * pFace)
+}//FaceDetectionListElem::FaceDetectionListElem(Face * pFace)
 
 
 
-ListElem::~ListElem()
+FaceDetectionListElem::~FaceDetectionListElem()
 {
     delete m_pFace;
     m_pNext->m_pPrev = m_pPrev;
     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_pCurElem = m_pHead;
-}//List::List()
+}//FaceDetectionList::FaceDetectionList()
 
-List::~List()
+FaceDetectionList::~FaceDetectionList()
 {
     void * tmp;
     while((tmp = m_pHead->m_pNext->m_pFace) != 0)
@@ -468,19 +468,19 @@ List::~List()
 
     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++;
-}//List::AddElem(Face * pFace)
+}//FaceDetectionList::AddElem(Face * pFace)
 
-Face * List::GetData()
+Face * FaceDetectionList::GetData()
 {
     m_pCurElem = m_pCurElem->m_pNext;
     return m_pCurElem->m_pFace;
-}//Face * List::GetData()
+}//Face * FaceDetectionList::GetData()