Commit Graph

16 Commits

Author SHA1 Message Date
Roman Donchenko
e59c74e1c7 Merge pull request #1348 from SpecLad:merge-2.4 2013-08-28 13:41:41 +04:00
Roman Donchenko
9b92545ce6 War on Whitespace, master edition: trailing spaces. 2013-08-27 13:57:24 +04:00
Jason Newton
affab4f156 correct range computations, it is difficult to do the more efficient single pass 3N/2 implementations correctly in this particular setting without costing more than they save 2013-08-27 00:34:22 -07:00
Vadim Pisarevsky
31857082f4 probably fixed build problems on Android 2012-12-18 14:12:07 -08:00
Jason Newton
e1b60aa4e3 drop usage of macros... the type is already there! 2012-12-16 22:44:36 -08:00
Jason Newton
5f86eb8d63 proper dimensions from cv::Size in output stats/centroid 2012-12-16 18:33:50 -08:00
Vadim Pisarevsky
1eae455acb fixed build warnings from VS; hopefully, fixes Android build too 2012-12-15 23:14:50 +04:00
Jason Newton
ad0bfdfb25 disable windows build warning for connectedcomponents template argument comparisons 2012-12-15 05:56:18 -08:00
Jason Newton
68e77ac051 use opencv's integer type convension 2012-12-15 04:25:55 -08:00
Jason Newton
d094e4bdbe drop support for 8bit output for size cost relative to utility 2012-12-08 23:09:17 -08:00
Jason Newton
e70b3ef598 use a ltype parameter to determine result Label image type; export stats with differening types over different outputarrays 2012-12-08 23:09:14 -08:00
Jason Newton
00bdca7684 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..
2012-11-27 02:31:38 -08:00
Jason Newton
d5aa679d3f adjust output type to return int32... it should at least be unsigned but this breaks python bindings;
remove non-8bit input type support, not worth the binary size
2012-11-22 21:26:52 -08:00
Jason Newton
85880397c4 connectedcomponents: use opencv integral types, add to docs, fix up things for a python export 2012-11-05 12:02:53 -08:00
Jason Newton
4c0cb2576d connectedComponents: peep-hole optimizations, mostly surrouding the fact that cv::Mat::at is expensive in a tight-loop -also added a "blobstats" version 2012-11-05 08:10:35 -08:00
Jason Newton
45b4f4f32b connectedComponents: warning free version 2012-11-05 08:10:29 -08:00