Merged the trunk r8408:8457 (inclusive)

2012-05-30 08:47:34 +00:00
parent 7b5a45eac4
commit 949c4edf41
42 changed files with 828 additions and 266 deletions
--- a/modules/ml/src/data.cpp
+++ b/modules/ml/src/data.cpp
@@ -177,12 +177,13 @@ int CvMLData::read_csv(const char* filename)
            ptr++;
    }

+	cols_count++;
+
    if ( cols_count == 0)
    {
        fclose(file);
        return -1;
    }
-    cols_count++;

    // create temporary memory storage to store the whole database
    el_ptr = new float[cols_count];