Move legacy part of opencv_contrib to separate header

2013-04-12 16:19:48 +04:00
parent 3b364330ad
commit 909d6fcf51
20 changed files with 1025 additions and 987 deletions
--- a/modules/contrib/src/octree.cpp
+++ b/modules/contrib/src/octree.cpp
@@ -258,7 +258,7 @@ namespace cv

    void Octree::buildTree(const std::vector<Point3f>& points3d, int maxLevels, int _minPoints)
    {
-        assert((size_t)maxLevels * 8 < MAX_STACK_SIZE);
+        CV_Assert((size_t)maxLevels * 8 < MAX_STACK_SIZE);
        points.resize(points3d.size());
        std::copy(points3d.begin(), points3d.end(), points.begin());
        minPoints = _minPoints;