Merge branch '2.4'

2012-10-23 20:32:19 +04:00
parent 1cb21d292b 15b7b01243
commit 8dbde3297e
24 changed files with 131 additions and 79 deletions
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@@ -2543,7 +2543,6 @@ public:
          data(_data),
          centers(_centers)
    {
-        CV_DbgAssert(centers.cols == data.cols);
    }

    void operator()( const BlockedRange& range ) const