]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - opencv/tiopencv.git/commitdiff
Merge pull request #1320 from mbarnach:svm_hog
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 21 Jan 2014 15:23:04 +0000 (19:23 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 21 Jan 2014 15:23:04 +0000 (19:23 +0400)
1  2 
modules/ml/include/opencv2/ml.hpp
modules/ml/src/svm.cpp

index aca013e09092808bce631592e03a674706a86b1a,e511d502425d1b2ba6d176af8f14620e9b7b93a6..42b90d22d970110a099178d52649fb9944c1ef47
@@@ -515,9 -515,11 +515,11 @@@ public
  
      CV_WRAP virtual int get_support_vector_count() const;
      virtual const float* get_support_vector(int i) const;
 -    virtual CvSVMParams get_params() const { return params; };
 +    virtual CvSVMParams get_params() const { return params; }
      CV_WRAP virtual void clear();
  
+     virtual const CvSVMDecisionFunc* get_decision_function() const { return decision_func; }
      static CvParamGrid get_default_grid( int param_id );
  
      virtual void write( CvFileStorage* storage, const char* name ) const;
Simple merge