generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed the ordering of parameters in PyArg_ParseTupleAndKeywords, added correct Ptr<CvDTreeSplit>::delete_obj() (ticket #406)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-11-25 23:16:32 +00:00
parent 40e1fd5b1e
commit 59e2afe4d2
4 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/ml/src/tree.cpp
View File

@@ -1803,17 +1803,22 @@ double CvDTree::calc_node_dir( CvDTreeNode* node )
namespace cv
{
template<> CV_EXPORTS void Ptr<CvDTreeSplit>::delete_obj()
{
fastFree(obj);
}
DTreeBestSplitFinder::DTreeBestSplitFinder( CvDTree* _tree, CvDTreeNode* _node)
{
tree = _tree;
node = _node;
splitSize = tree->get_data()->split_heap->elem_size;
bestSplit = (CvDTreeSplit*)(new char[splitSize]);
bestSplit = (CvDTreeSplit*)fastMalloc(splitSize);
memset((CvDTreeSplit*)bestSplit, 0, splitSize);
bestSplit->quality = -1;
bestSplit->condensed_idx = INT_MIN;
split = (CvDTreeSplit*)(new char[splitSize]);
split = (CvDTreeSplit*)fastMalloc(splitSize);
memset((CvDTreeSplit*)split, 0, splitSize);
//haveSplit = false;
}
@@ -1824,9 +1829,9 @@ DTreeBestSplitFinder::DTreeBestSplitFinder( const DTreeBestSplitFinder& finder,
node = finder.node;
splitSize = tree->get_data()->split_heap->elem_size;
bestSplit = (CvDTreeSplit*)(new char[splitSize]);
bestSplit = (CvDTreeSplit*)fastMalloc(splitSize);
memcpy((CvDTreeSplit*)(bestSplit), (const CvDTreeSplit*)finder.bestSplit, splitSize);
split = (CvDTreeSplit*)(new char[splitSize]);
split = (CvDTreeSplit*)fastMalloc(splitSize);
memset((CvDTreeSplit*)split, 0, splitSize);
}