generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hopefully fixed compile warnings and the doc builder warnings

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-02-03 16:36:36 +04:00
parent 30593ee55e
commit de4b1c668d
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/objdetect/src/cascadedetect.cpp
View File

@ -464,7 +464,7 @@ bool FeatureEvaluator::setImage( InputArray _image, const std::vector<float>& _s
{ {
Size imgsz = _image.size(); Size imgsz = _image.size();
bool recalcOptFeatures = updateScaleData(imgsz, _scales); bool recalcOptFeatures = updateScaleData(imgsz, _scales);
size_t i, nscales = scaleData->size(); size_t i, nscales = scaleData->size();
Size sz0 = scaleData->at(0).szi; Size sz0 = scaleData->at(0).szi;
sz0 = Size(std::max(rbuf.cols, (int)alignSize(sz0.width, 16)), std::max(rbuf.rows, sz0.height)); 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); optfeatures->resize(nfeatures);
optfeaturesPtr = &(*optfeatures)[0]; optfeaturesPtr = &(*optfeatures)[0];
for( fi = 0; fi < nfeatures; fi++ ) for( fi = 0; fi < nfeatures; fi++ )
optfeaturesPtr[fi].setOffsets( ff[fi], sstep ); optfeaturesPtr[fi].setOffsets( ff[fi], sstep );
copyVectorToUMat(*optfeatures, ufbuf); copyVectorToUMat(*optfeatures, ufbuf);
} }
@ -1098,7 +1098,7 @@ bool CascadeClassifierImpl::ocl_detectMultiScaleNoGrouping( const std::vector<fl
{ {
if (data.maxNodesPerTree > 1) if (data.maxNodesPerTree > 1)
return false; return false;
Ptr<LBPEvaluator> lbp = featureEvaluator.dynamicCast<LBPEvaluator>(); Ptr<LBPEvaluator> lbp = featureEvaluator.dynamicCast<LBPEvaluator>();
if( lbp.empty() ) if( lbp.empty() )
return false; return false;
@ -1200,9 +1200,8 @@ void CascadeClassifierImpl::detectMultiScaleNoGrouping( InputArray _image, std::
bool outputRejectLevels ) bool outputRejectLevels )
{ {
Size imgsz = _image.size(); Size imgsz = _image.size();
Mat grayImage; Mat grayImage;
UMat ugrayImage;
_InputArray gray; _InputArray gray;
candidates.clear(); candidates.clear();

4
modules/objdetect/src/cascadedetect.hpp
View File

@ -28,7 +28,7 @@ public:
}; };
virtual ~FeatureEvaluator(); virtual ~FeatureEvaluator();
virtual bool read(const FileNode& node, Size origWinSize); virtual bool read(const FileNode& node, Size origWinSize);
virtual Ptr<FeatureEvaluator> clone() const; virtual Ptr<FeatureEvaluator> clone() const;
virtual int getFeatureType() const; virtual int getFeatureType() const;
@ -211,7 +211,7 @@ protected:
Ptr<CvHaarClassifierCascade> oldCascade; Ptr<CvHaarClassifierCascade> oldCascade;
Ptr<MaskGenerator> maskGenerator; Ptr<MaskGenerator> maskGenerator;
UMat ugrayImage, uimageBuffer; UMat ugrayImage;
UMat ufacepos, ustages, unodes, uleaves, usubsets; UMat ufacepos, ustages, unodes, uleaves, usubsets;
ocl::Kernel haarKernel, lbpKernel; ocl::Kernel haarKernel, lbpKernel;
bool tryOpenCL; bool tryOpenCL;

2
modules/objdetect/src/opencl/cascadedetect.cl
View File

@ -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.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.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 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; s += (bitset[idx] & (1 << mask)) ? st.z : st.w;
} }