merged the trunk r8704:8716

2012-06-28 16:13:29 +00:00
parent 2777ebb8a0
commit 680a44189c
83 changed files with 2402 additions and 2052 deletions
--- a/samples/c/blobtrack_sample.cpp
+++ b/samples/c/blobtrack_sample.cpp
@@ -368,7 +368,7 @@ static void print_params(CvVSModule* pM, const char* module, const char* log_nam
 int main(int argc, char* argv[])
 {   /* Main function: */
    CvCapture*                  pCap = NULL;
-    CvBlobTrackerAutoParam1     param = {0};
+    CvBlobTrackerAutoParam1     param = {0,0,0,0,0,0,0,0};
    CvBlobTrackerAuto*          pTracker = NULL;

    //float       scale = 1;