Merge branch 2.4

2013-01-11 15:43:50 +04:00
parent 19229f2fa0 5e2726fb17
commit 084b1c7969
25 changed files with 556 additions and 359 deletions
--- a/modules/contrib/include/opencv2/contrib/retina.hpp
+++ b/modules/contrib/include/opencv2/contrib/retina.hpp
@@ -203,10 +203,10 @@ public:
     */
    void setup(RetinaParameters newParameters);

-        /**
-         * @return the current parameters setup
-         */
-        struct Retina::RetinaParameters getParameters();
+    /**
+     * @return the current parameters setup
+     */
+    struct Retina::RetinaParameters getParameters();

    /**
     * parameters setup display method