diff --git a/modules/objdetect/src/cascadedetect.cpp b/modules/objdetect/src/cascadedetect.cpp index 15a1ca2659..ef9d21ec18 100644 --- a/modules/objdetect/src/cascadedetect.cpp +++ b/modules/objdetect/src/cascadedetect.cpp @@ -464,7 +464,7 @@ bool FeatureEvaluator::setImage( InputArray _image, const std::vector& _s { Size imgsz = _image.size(); bool recalcOptFeatures = updateScaleData(imgsz, _scales); - + size_t i, nscales = scaleData->size(); Size sz0 = scaleData->at(0).szi; sz0 = Size(std::max(rbuf.cols, (int)alignSize(sz0.width, 16)), std::max(rbuf.rows, sz0.height)); @@ -802,7 +802,7 @@ void LBPEvaluator::computeOptFeatures() optfeatures->resize(nfeatures); optfeaturesPtr = &(*optfeatures)[0]; for( fi = 0; fi < nfeatures; fi++ ) - optfeaturesPtr[fi].setOffsets( ff[fi], sstep ); + optfeaturesPtr[fi].setOffsets( ff[fi], sstep ); copyVectorToUMat(*optfeatures, ufbuf); } @@ -1098,7 +1098,7 @@ bool CascadeClassifierImpl::ocl_detectMultiScaleNoGrouping( const std::vector 1) return false; - + Ptr lbp = featureEvaluator.dynamicCast(); if( lbp.empty() ) return false; @@ -1200,9 +1200,8 @@ void CascadeClassifierImpl::detectMultiScaleNoGrouping( InputArray _image, std:: bool outputRejectLevels ) { Size imgsz = _image.size(); - + Mat grayImage; - UMat ugrayImage; _InputArray gray; candidates.clear(); diff --git a/modules/objdetect/src/cascadedetect.hpp b/modules/objdetect/src/cascadedetect.hpp index b568c904ac..166d05b54f 100644 --- a/modules/objdetect/src/cascadedetect.hpp +++ b/modules/objdetect/src/cascadedetect.hpp @@ -28,7 +28,7 @@ public: }; virtual ~FeatureEvaluator(); - + virtual bool read(const FileNode& node, Size origWinSize); virtual Ptr clone() const; virtual int getFeatureType() const; @@ -211,7 +211,7 @@ protected: Ptr oldCascade; Ptr maskGenerator; - UMat ugrayImage, uimageBuffer; + UMat ugrayImage; UMat ufacepos, ustages, unodes, uleaves, usubsets; ocl::Kernel haarKernel, lbpKernel; bool tryOpenCL; diff --git a/modules/objdetect/src/opencl/cascadedetect.cl b/modules/objdetect/src/opencl/cascadedetect.cl index 88b3624d4a..09842ba4fa 100644 --- a/modules/objdetect/src/opencl/cascadedetect.cl +++ b/modules/objdetect/src/opencl/cascadedetect.cl @@ -546,7 +546,7 @@ void runLBPClassifierStump( mask |= (CALC_SUM_OFS_( ofs.s9, ofs.sa, ofs.sd, ofs.se, p ) >= cval ? 4 : 0); // 7 mask |= (CALC_SUM_OFS_( ofs.s8, ofs.s9, ofs.sc, ofs.sd, p ) >= cval ? 2 : 0); // 6 mask |= (CALC_SUM_OFS_( ofs.s4, ofs.s5, ofs.s8, ofs.s9, p ) >= cval ? 1 : 0); // 7 - + s += (bitset[idx] & (1 << mask)) ? st.z : st.w; }