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/nvidia/TestRectStdDev.h
+++ b/modules/gpu/test/nvidia/TestRectStdDev.h
@@ -33,9 +33,9 @@ private:
 	TestRectStdDev& operator=(const TestRectStdDev&);	

    NCVTestSourceProvider<Ncv8u> &src;
-    NcvRect32u rect;
    Ncv32u width;
    Ncv32u height;
+    NcvRect32u rect;
    Ncv32f scaleFactor;

    NcvBool bTextureCache;