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/modules/legacy/test/test_em.cpp
+++ b/modules/legacy/test/test_em.cpp
@@ -105,7 +105,9 @@ void generateData( Mat& data, Mat& labels, const vector<int>& sizes, const Mat&
            else if( labelType == CV_32SC1 )
                labels.at<int>(p, 0) = l;
            else
+            {
                CV_DbgAssert(0);
+            }
        }
    }
 }