merged all the latest changes from 2.4 to trunk

2012-04-13 21:50:59 +00:00
parent 020f9a6047
commit 2fd1e2ea57
416 changed files with 12852 additions and 6070 deletions
--- a/modules/gpu/test/utility.cpp
+++ b/modules/gpu/test/utility.cpp
@@ -195,7 +195,7 @@ Mat getMat(InputArray arr)
    return arr.getMat();
 }

-double checkNorm(InputArray m1, const InputArray m2)
+double checkNorm(InputArray m1, InputArray m2)
 {
    return norm(getMat(m1), getMat(m2), NORM_INF);
 }