Browse Source

Change the train function signature to match Opencv svn.

git-svn-id: https://emgucv.svn.sourceforge.net/svnroot/emgucv/trunk@845 d7f09016-e345-0410-b530-edf29a71df78
UWP10
canming 15 years ago
parent
commit
fe801e4bd1
  1. 4
      Emgu.CV.Extern/RTreeClassifier.cpp
  2. 25
      Emgu.CV/Features2D/RTreeClassifier.cs

4
Emgu.CV.Extern/RTreeClassifier.cpp

@ -12,7 +12,7 @@ CVAPI(void) CvRTreeClassifierTrain(
cv::RNG* rng,
int num_trees, int depth,
int views, size_t reduced_num_dim,
int num_quant_bits, bool print_status)
int num_quant_bits)
{
std::vector<cv::BaseKeypoint> base_set;
for (int i=0;i<numberOfPoints;i++)
@ -20,7 +20,7 @@ CVAPI(void) CvRTreeClassifierTrain(
base_set.push_back(cv::BaseKeypoint(train_points[i].x,train_points[i].y,const_cast<IplImage*>(train_image)));
}
classifier->train(base_set, *rng, num_trees, depth, views, reduced_num_dim, num_quant_bits, print_status);
classifier->train(base_set, *rng, num_trees, depth, views, reduced_num_dim, num_quant_bits);
}
CVAPI(int) CvRTreeClassifierGetOriginalNumClasses(cv::RTreeClassifier* classifier) { return classifier->original_num_classes(); }

25
Emgu.CV/RTreeClassifier.cs → Emgu.CV/Features2D/RTreeClassifier.cs

@ -1,13 +1,13 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Diagnostics;
using System.Drawing;
using System.Runtime.InteropServices;
using Emgu.Util;
using System.Text;
using Emgu.CV.Structure;
using System.Drawing;
using System.Diagnostics;
using Emgu.Util;
namespace Emgu.CV
namespace Emgu.CV.Features2D
{
internal class RTreeClassifierExtern
{
@ -21,15 +21,13 @@ namespace Emgu.CV
[DllImport(CvInvoke.EXTERN_LIBRARY)]
public static extern void CvRTreeClassifierTrain(
IntPtr classifier,
IntPtr train_image,
IntPtr train_points,
IntPtr trainImage,
IntPtr trainPoints,
int numberOfPoints,
ref UInt64 rng,
int num_trees, int depth,
int views, IntPtr reduced_num_dim,
int num_quant_bits,
[MarshalAs(UnmanagedType.I1)]
bool print_status);
int numTrees, int depth,
int views, IntPtr reducedNumDim,
int numQuantBits);
[DllImport(CvInvoke.EXTERN_LIBRARY)]
public static extern int CvRTreeClassifierGetSigniture(
@ -90,8 +88,7 @@ namespace Emgu.CV
depth,
views,
new IntPtr(reducedNumDim),
numQuantBits,
false);
numQuantBits);
handle.Free();
}
Loading…
Cancel
Save