Merge branch '2.4'

2013-02-28 11:10:40 +04:00
parent c5e979ceb7 2be893a21e
commit 891d7da6ee
39 changed files with 6898 additions and 386 deletions
--- a/modules/features2d/include/opencv2/features2d/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d/features2d.hpp
@@ -659,6 +659,7 @@ protected:
  virtual void findBlobs(const Mat &image, const Mat &binaryImage, std::vector<Center> &centers) const;

  Params params;
+  AlgorithmInfo* info() const;
 };