Merge pull request #372 from cuda-geek:gpu-cascade-fixes

This commit is contained in:
cuda-geek
2013-01-31 20:13:30 +04:00
committed by OpenCV Buildbot
7 changed files with 182 additions and 213 deletions

View File

@@ -488,7 +488,6 @@ protected:
Ptr<MaskGenerator> maskGenerator;
};
// Implementation of soft (stageless) cascaded detector.
class CV_EXPORTS_W SCascade : public Algorithm
{

View File

@@ -41,7 +41,6 @@
//M*/
#include "precomp.hpp"
#include <iostream>
namespace {
@@ -365,7 +364,7 @@ struct cv::SCascade::Fields
std::string fformat = (string)root[FEATURE_FORMAT];
bool useBoxes = (fformat == "BOX");
// only HOG-like integral channel features cupported
// only HOG-like integral channel features supported
string featureTypeStr = (string)root[SC_FEATURE_TYPE];
CV_Assert(featureTypeStr == SC_ICF);