From ce0557ebb82dd01f3c89ac4cedeb20c1c712feee Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Sun, 23 Feb 2014 21:07:20 +0400 Subject: [PATCH] fixed defects from Xcode --- modules/calib3d/src/circlesgrid.cpp | 1 + modules/calib3d/test/test_chesscorners.cpp | 2 +- modules/core/src/copy.cpp | 3 ++- modules/core/src/system.cpp | 1 + modules/imgproc/src/accum.cpp | 2 +- modules/imgproc/src/clahe.cpp | 12 ++++-------- modules/objdetect/src/erfilter.cpp | 3 +-- modules/objdetect/test/test_cascadeandhog.cpp | 6 ++++-- modules/shape/src/scd_def.hpp | 1 - modules/video/src/bgfg_gaussmix2.cpp | 4 ++-- modules/video/src/optflowgf.cpp | 17 ++++++----------- 11 files changed, 23 insertions(+), 29 deletions(-) diff --git a/modules/calib3d/src/circlesgrid.cpp b/modules/calib3d/src/circlesgrid.cpp index f44807e..0b89e18 100644 --- a/modules/calib3d/src/circlesgrid.cpp +++ b/modules/calib3d/src/circlesgrid.cpp @@ -218,6 +218,7 @@ void CirclesGridClusterFinder::findCorners(const std::vector &hull2 void CirclesGridClusterFinder::findOutsideCorners(const std::vector &corners, std::vector &outsideCorners) { + CV_Assert(!corners.empty()); outsideCorners.clear(); //find two pairs of the most nearest corners int i, j, n = (int)corners.size(); diff --git a/modules/calib3d/test/test_chesscorners.cpp b/modules/calib3d/test/test_chesscorners.cpp index 44e7e6c..fd3da2e 100644 --- a/modules/calib3d/test/test_chesscorners.cpp +++ b/modules/calib3d/test/test_chesscorners.cpp @@ -311,7 +311,7 @@ void CV_ChessboardDetectorTest::run_batch( const string& filename ) if (count != 0) sum_error /= count; - ts->printf(cvtest::TS::LOG, "Average error is %f\n", sum_error); + ts->printf(cvtest::TS::LOG, "Average error is %f (%d patterns have been found)\n", sum_error, count); } double calcErrorMinError(const Size& cornSz, const vector& corners_found, const vector& corners_generated) diff --git a/modules/core/src/copy.cpp b/modules/core/src/copy.cpp index a227aa4..3c051e6 100644 --- a/modules/core/src/copy.cpp +++ b/modules/core/src/copy.cpp @@ -353,7 +353,7 @@ Mat& Mat::operator = (const Scalar& s) Mat& Mat::setTo(InputArray _value, InputArray _mask) { - if( !data ) + if( empty() ) return *this; Mat value = _value.getMat(), mask = _mask.getMat(); @@ -632,6 +632,7 @@ int cv::borderInterpolate( int p, int len, int borderType ) } else if( borderType == BORDER_WRAP ) { + CV_Assert(len > 0); if( p < 0 ) p -= ((p-len+1)/len)*len; if( p >= len ) diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp index 7c61e4b..d8d8ae6 100644 --- a/modules/core/src/system.cpp +++ b/modules/core/src/system.cpp @@ -426,6 +426,7 @@ String format( const char* fmt, ... ) String s(len, '\0'); va_start(va, fmt); len = vsnprintf((char*)s.c_str(), len + 1, fmt, va); + (void)len; va_end(va); return s; } diff --git a/modules/imgproc/src/accum.cpp b/modules/imgproc/src/accum.cpp index 4d13ce2..f130f34 100644 --- a/modules/imgproc/src/accum.cpp +++ b/modules/imgproc/src/accum.cpp @@ -408,7 +408,7 @@ static bool ocl_accumulate( InputArray _src, InputArray _src2, InputOutputArray argidx = k.set(argidx, alpha); } if (haveMask) - argidx = k.set(argidx, maskarg); + k.set(argidx, maskarg); size_t globalsize[2] = { src.cols, src.rows }; return k.run(2, globalsize, NULL, false); diff --git a/modules/imgproc/src/clahe.cpp b/modules/imgproc/src/clahe.cpp index 138bf83..690d820 100644 --- a/modules/imgproc/src/clahe.cpp +++ b/modules/imgproc/src/clahe.cpp @@ -83,11 +83,9 @@ namespace clahe idx = k.set(idx, tile_size); idx = k.set(idx, tilesX); idx = k.set(idx, clipLimit); - idx = k.set(idx, lutScale); + k.set(idx, lutScale); - if (!k.run(2, globalThreads, localThreads, false)) - return false; - return true; + return k.run(2, globalThreads, localThreads, false); } static bool transform(cv::InputArray _src, cv::OutputArray _dst, cv::InputArray _lut, @@ -118,11 +116,9 @@ namespace clahe idx = k.set(idx, src.rows); idx = k.set(idx, tile_size); idx = k.set(idx, tilesX); - idx = k.set(idx, tilesY); + k.set(idx, tilesY); - if (!k.run(2, globalThreads, localThreads, false)) - return false; - return true; + return k.run(2, globalThreads, localThreads, false); } } diff --git a/modules/objdetect/src/erfilter.cpp b/modules/objdetect/src/erfilter.cpp index 4366464..dc8f18c 100644 --- a/modules/objdetect/src/erfilter.cpp +++ b/modules/objdetect/src/erfilter.cpp @@ -294,7 +294,7 @@ void ERFilterNM::er_tree_extract( InputArray image ) push_new_component = false; // explore the (remaining) edges to the neighbors to the current pixel - for (current_edge = current_edge; current_edge < 4; current_edge++) + for ( ; current_edge < 4; current_edge++) { int neighbour_pixel = current_pixel; @@ -1949,7 +1949,6 @@ private: double (dissimilarity::*distfn) (const int_fast32_t, const int_fast32_t) const; auto_array_ptr precomputed; - double * precomputed2; double * V; const double * V_data; diff --git a/modules/objdetect/test/test_cascadeandhog.cpp b/modules/objdetect/test/test_cascadeandhog.cpp index e4637e8..746a48c 100644 --- a/modules/objdetect/test/test_cascadeandhog.cpp +++ b/modules/objdetect/test/test_cascadeandhog.cpp @@ -574,7 +574,7 @@ public: Size winStride = Size(), Size padding = Size(), const vector& locations = vector()) const; - virtual void compute(const Mat& img, vector& descriptors, + virtual void compute(InputArray img, vector& descriptors, Size winStride = Size(), Size padding = Size(), const vector& locations = vector()) const; @@ -1107,9 +1107,11 @@ void HOGDescriptorTester::detect(const Mat& img, vector& hits, double hit detect(img, hits, weightsV, hitThreshold, winStride, padding, locations); } -void HOGDescriptorTester::compute(const Mat& img, vector& descriptors, +void HOGDescriptorTester::compute(InputArray _img, vector& descriptors, Size winStride, Size padding, const vector& locations) const { + Mat img = _img.getMat(); + if( winStride == Size() ) winStride = cellSize; Size cacheStride(gcd(winStride.width, blockStride.width), diff --git a/modules/shape/src/scd_def.hpp b/modules/shape/src/scd_def.hpp index 1a180fd..d5bb5e4 100644 --- a/modules/shape/src/scd_def.hpp +++ b/modules/shape/src/scd_def.hpp @@ -120,7 +120,6 @@ public: private: float minMatchCost; - float betaAdditional; protected: void buildCostMatrix(const cv::Mat& descriptors1, const cv::Mat& descriptors2, cv::Mat& costMatrix, cv::Ptr& comparer) const; diff --git a/modules/video/src/bgfg_gaussmix2.cpp b/modules/video/src/bgfg_gaussmix2.cpp index 8650de9..1e6ee0d 100644 --- a/modules/video/src/bgfg_gaussmix2.cpp +++ b/modules/video/src/bgfg_gaussmix2.cpp @@ -779,7 +779,7 @@ bool BackgroundSubtractorMOG2Impl::ocl_apply(InputArray _image, OutputArray _fgm idxArg = kernel_apply.set(idxArg, varMax); idxArg = kernel_apply.set(idxArg, fVarInit); idxArg = kernel_apply.set(idxArg, fTau); - idxArg = kernel_apply.set(idxArg, nShadowDetection); + kernel_apply.set(idxArg, nShadowDetection); size_t globalsize[] = {frame.cols, frame.rows, 1}; @@ -805,7 +805,7 @@ bool BackgroundSubtractorMOG2Impl::ocl_getBackgroundImage(OutputArray _backgroun idxArg = kernel_getBg.set(idxArg, ocl::KernelArg::ReadOnlyNoSize(u_weight)); idxArg = kernel_getBg.set(idxArg, ocl::KernelArg::ReadOnlyNoSize(u_mean)); idxArg = kernel_getBg.set(idxArg, ocl::KernelArg::WriteOnlyNoSize(dst)); - idxArg = kernel_getBg.set(idxArg, backgroundRatio); + kernel_getBg.set(idxArg, backgroundRatio); size_t globalsize[2] = {u_bgmodelUsedModes.cols, u_bgmodelUsedModes.rows}; diff --git a/modules/video/src/optflowgf.cpp b/modules/video/src/optflowgf.cpp index 73aedec..c0b1d88 100644 --- a/modules/video/src/optflowgf.cpp +++ b/modules/video/src/optflowgf.cpp @@ -857,7 +857,7 @@ private: idxArg = kernel.set(idxArg, dst.cols); idxArg = kernel.set(idxArg, ocl::KernelArg::PtrReadOnly(m_gKer)); idxArg = kernel.set(idxArg, (int)ksizeHalf); - idxArg = kernel.set(idxArg, (void *)NULL, smem_size); + kernel.set(idxArg, (void *)NULL, smem_size); return kernel.run(2, globalsize, localsize, false); } bool gaussianBlur5Ocl(const UMat &src, int ksizeHalf, UMat &dst) @@ -883,7 +883,7 @@ private: idxArg = kernel.set(idxArg, src.cols); idxArg = kernel.set(idxArg, ocl::KernelArg::PtrReadOnly(m_gKer)); idxArg = kernel.set(idxArg, (int)ksizeHalf); - idxArg = kernel.set(idxArg, (void *)NULL, smem_size); + kernel.set(idxArg, (void *)NULL, smem_size); return kernel.run(2, globalsize, localsize, false); } bool polynomialExpansionOcl(const UMat &src, UMat &dst) @@ -919,12 +919,7 @@ private: idxArg = kernel.set(idxArg, ocl::KernelArg::PtrReadOnly(m_xg)); idxArg = kernel.set(idxArg, ocl::KernelArg::PtrReadOnly(m_xxg)); idxArg = kernel.set(idxArg, (void *)NULL, smem_size); -#if 0 - if (useDouble) - idxArg = kernel.set(idxArg, (void *)m_igd, 4 * sizeof(double)); - else -#endif - idxArg = kernel.set(idxArg, (void *)m_ig, 4 * sizeof(float)); + kernel.set(idxArg, (void *)m_ig, 4 * sizeof(float)); return kernel.run(2, globalsize, localsize, false); } bool boxFilter5Ocl(const UMat &src, int ksizeHalf, UMat &dst) @@ -951,7 +946,7 @@ private: idxArg = kernel.set(idxArg, height); idxArg = kernel.set(idxArg, src.cols); idxArg = kernel.set(idxArg, (int)ksizeHalf); - idxArg = kernel.set(idxArg, (void *)NULL, smem_size); + kernel.set(idxArg, (void *)NULL, smem_size); return kernel.run(2, globalsize, localsize, false); } @@ -976,7 +971,7 @@ private: idxArg = kernel.set(idxArg, ocl::KernelArg::PtrReadOnly(flowy)); idxArg = kernel.set(idxArg, (int)(flowy.step / flowy.elemSize())); idxArg = kernel.set(idxArg, (int)flowy.rows); - idxArg = kernel.set(idxArg, (int)flowy.cols); + kernel.set(idxArg, (int)flowy.cols); return kernel.run(2, globalsize, localsize, false); } bool updateMatricesOcl(const UMat &flowx, const UMat &flowy, const UMat &R0, const UMat &R1, UMat &M) @@ -1004,7 +999,7 @@ private: idxArg = kernel.set(idxArg, ocl::KernelArg::PtrReadOnly(R1)); idxArg = kernel.set(idxArg, (int)(R1.step / R1.elemSize())); idxArg = kernel.set(idxArg, ocl::KernelArg::PtrWriteOnly(M)); - idxArg = kernel.set(idxArg, (int)(M.step / M.elemSize())); + kernel.set(idxArg, (int)(M.step / M.elemSize())); return kernel.run(2, globalsize, localsize, false); } -- 2.7.4