moved helper TBB classes out of the external headers for now

git-svn-id: https://code.ros.org/svn/opencv/trunk@2958 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/include/opencv/ml.h b/opencv/include/opencv/ml.h
index b6b56300ce9919dcb418ba60680c23c0ca5dd02e..1e3f573893d0f7656238adfba713825dbfc20f0e 100644 (file)
--- a/opencv/include/opencv/ml.h
+++ b/opencv/include/opencv/ml.h
@@ -911,30 +911,10 @@ class CvForestTree;
 
 namespace cv
 {
-    struct DTreeBestSplitFinder
-    {
-        DTreeBestSplitFinder(){ tree = 0; node = 0; }
-        DTreeBestSplitFinder( CvDTree* _tree, CvDTreeNode* _node);
-        DTreeBestSplitFinder( const DTreeBestSplitFinder& finder, Split );
-        virtual void operator()(const BlockedRange& range);
-        void join( DTreeBestSplitFinder& rhs );
-        Ptr<CvDTreeSplit> bestSplit;
-        Ptr<CvDTreeSplit> split;
-        int splitSize;
-        CvDTree* tree;
-        CvDTreeNode* node;
-    };
-
-    struct ForestTreeBestSplitFinder : DTreeBestSplitFinder
-    {
-        ForestTreeBestSplitFinder() : DTreeBestSplitFinder() {}
-        ForestTreeBestSplitFinder( CvForestTree* _tree, CvDTreeNode* _node );
-        ForestTreeBestSplitFinder( const ForestTreeBestSplitFinder& finder, Split );
-        virtual void operator()(const BlockedRange& range);
-    };
+    struct DTreeBestSplitFinder;
+    struct ForestTreeBestSplitFinder;
 }
 
-
 class CV_EXPORTS CvDTree : public CvStatModel
 {
 public:

diff --git a/opencv/src/ml/_ml.h b/opencv/src/ml/_ml.h
index 25e48c7ab356434df2b28135df1fc3c1ac317940..f5b8723f8fe2b78a85b2ecb4b299e536ff08ac0a 100644 (file)
--- a/opencv/src/ml/_ml.h
+++ b/opencv/src/ml/_ml.h
@@ -345,4 +345,29 @@ const float** cvGetTrainSamples( const CvMat* train_data, int tflag,
                    int* _var_count, int* _sample_count,
                    bool always_copy_data=false );
 
+namespace cv
+{
+    struct DTreeBestSplitFinder
+    {
+        DTreeBestSplitFinder(){ tree = 0; node = 0; }
+        DTreeBestSplitFinder( CvDTree* _tree, CvDTreeNode* _node);
+        DTreeBestSplitFinder( const DTreeBestSplitFinder& finder, Split );
+        virtual void operator()(const BlockedRange& range);
+        void join( DTreeBestSplitFinder& rhs );
+        Ptr<CvDTreeSplit> bestSplit;
+        Ptr<CvDTreeSplit> split;
+        int splitSize;
+        CvDTree* tree;
+        CvDTreeNode* node;
+    };
+    
+    struct ForestTreeBestSplitFinder : DTreeBestSplitFinder
+    {
+        ForestTreeBestSplitFinder() : DTreeBestSplitFinder() {}
+        ForestTreeBestSplitFinder( CvForestTree* _tree, CvDTreeNode* _node );
+        ForestTreeBestSplitFinder( const ForestTreeBestSplitFinder& finder, Split );
+        virtual void operator()(const BlockedRange& range);
+    };
+}
+
 #endif /* __ML_H__ */