Merge release 2.4.3

2012-11-02 17:45:58 +04:00
parent 66b90d19a6 6484732509
commit 4d059e9e5b
126 changed files with 61518 additions and 51142 deletions
--- a/samples/cpp/pca.cpp
+++ b/samples/cpp/pca.cpp
@@ -64,7 +64,7 @@ static void read_imgList(const string& filename, vector<Mat>& images) {

 static  Mat formatImagesForPCA(const vector<Mat> &data)
 {
-    Mat dst(data.size(), data[0].rows*data[0].cols, CV_32F);
+    Mat dst(static_cast<int>(data.size()), data[0].rows*data[0].cols, CV_32F);
    for(unsigned int i = 0; i < data.size(); i++)
    {
        Mat image_row = data[i].clone().reshape(1,1);