Merge pull request #650 from taka-no-me:cvdef

2013-03-18 13:10:53 +04:00
parent d8755fd1c0 e75df56317
commit f510b49cc2
32 changed files with 511 additions and 387 deletions
--- a/modules/softcascade/src/integral_channel_builder.cpp
+++ b/modules/softcascade/src/integral_channel_builder.cpp
@@ -55,7 +55,7 @@ public:

    virtual int totalChannels() const {return N_CHANNELS; }

-    virtual void operator()(cv::InputArray _frame, CV_OUT cv::OutputArray _integrals, cv::Size channelsSize) const
+    virtual void operator()(cv::InputArray _frame, cv::OutputArray _integrals, cv::Size channelsSize) const
    {
        CV_Assert(_frame.type() == CV_8UC3);