Merged the trunk r8589:8653 - all changes related to build warnings

2012-06-15 13:04:17 +00:00
parent 73c152abc4
commit bd0e0b5800
438 changed files with 20374 additions and 19674 deletions
--- a/modules/legacy/src/blobtrackingcc.cpp
+++ b/modules/legacy/src/blobtrackingcc.cpp
@@ -301,8 +301,8 @@ public:
        {   /* Find a neighbour on current frame
             * for each blob from previous frame:
             */
-            CvBlob*         pB = m_BlobList.GetBlob(i-1);
-            DefBlobTracker* pBT = (DefBlobTracker*)pB;
+            CvBlob*         pBl = m_BlobList.GetBlob(i-1);
+            DefBlobTracker* pBT = (DefBlobTracker*)pBl;
            //int             BlobID = CV_BLOB_ID(pB);
            //CvBlob*         pBBest = NULL;
            //double          DistBest = -1;