Merge branch '2.4'

2013-01-29 14:17:13 +04:00
parent 013e9294f6 63873a8393
commit 78a338159d
11 changed files with 152 additions and 24 deletions
--- a/modules/objdetect/src/matching.cpp
+++ b/modules/objdetect/src/matching.cpp
@@ -1212,6 +1212,7 @@ int maxFunctionalScore(const CvLSVMFilterObject **all_F, int n,
        free(tmpPartsDisplacement[i]);
    }
    free(tmpPoints);
+    free(tmpPartsDisplacement);
    free(tmpScore);
    free(tmpKPoints);