A few changes to comply with upstream requirements for merge.

-Change input/output order from (out Labeled, in Image) -> (in Image, Out Labeled) and convert
to Input/OutputArrays in the process.

-Adopt OutputArray for statistics export so that the algorithm is "wrapper friendly" and not requiring a new struct in
language bindings at the expense of using doubles for everything and slowing statistics computation down..
This commit is contained in:
Jason Newton
2012-11-27 02:25:52 -08:00
parent d5aa679d3f
commit 00bdca7684
4 changed files with 59 additions and 66 deletions

View File

@@ -123,7 +123,6 @@ typedef Ptr<FeatureDetector> Ptr_FeatureDetector;
typedef Ptr<DescriptorExtractor> Ptr_DescriptorExtractor;
typedef Ptr<Feature2D> Ptr_Feature2D;
typedef Ptr<DescriptorMatcher> Ptr_DescriptorMatcher;
typedef vector<ConnectedComponentStats> vector_ConnectedComponentStats;
typedef SimpleBlobDetector::Params SimpleBlobDetector_Params;