From: Andy Maloney Date: Fri, 1 Feb 2013 23:09:58 +0000 (-0500) Subject: Remove unused vars X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1314^2~1560^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc68dfb4e8a89f291945fa886be168872d99081f;p=platform%2Fupstream%2Fopencv.git Remove unused vars --- diff --git a/modules/contrib/src/chamfermatching.cpp b/modules/contrib/src/chamfermatching.cpp index d33b243..881606a 100644 --- a/modules/contrib/src/chamfermatching.cpp +++ b/modules/contrib/src/chamfermatching.cpp @@ -622,7 +622,6 @@ void ChamferMatcher::Matching::followContour(Mat& templ_img, template_coords_t& { const int dir[][2] = { {-1,-1}, {-1,0}, {-1,1}, {0,1}, {1,1}, {1,0}, {1,-1}, {0,-1} }; coordinate_t next; - coordinate_t next_temp; unsigned char ptr; assert (direction==-1 || !coords.empty()); diff --git a/modules/gpu/src/cascadeclassifier.cpp b/modules/gpu/src/cascadeclassifier.cpp index ac839ce..cfaa753 100644 --- a/modules/gpu/src/cascadeclassifier.cpp +++ b/modules/gpu/src/cascadeclassifier.cpp @@ -771,8 +771,6 @@ NCVStatus loadFromXML(const std::string &filename, haar.bNeedsTiltedII = false; Ncv32u curMaxTreeDepth; - std::vector xmlFileCont; - std::vector h_TmpClassifierNotRootNodes; haarStages.resize(0); haarClassifierNodes.resize(0); diff --git a/modules/imgproc/src/pyramids.cpp b/modules/imgproc/src/pyramids.cpp index a337df7..e7d315c 100644 --- a/modules/imgproc/src/pyramids.cpp +++ b/modules/imgproc/src/pyramids.cpp @@ -327,11 +327,10 @@ pyrUp_( const Mat& _src, Mat& _dst, int) CV_Assert( std::abs(dsize.width - ssize.width*2) == dsize.width % 2 && std::abs(dsize.height - ssize.height*2) == dsize.height % 2); - int k, x, sy0 = -PU_SZ/2, sy = sy0, width0 = ssize.width - 1; + int k, x, sy0 = -PU_SZ/2, sy = sy0; ssize.width *= cn; dsize.width *= cn; - width0 *= cn; for( x = 0; x < ssize.width; x++ ) dtab[x] = (x/cn)*2*cn + x % cn; diff --git a/modules/objdetect/src/matching.cpp b/modules/objdetect/src/matching.cpp index 11873b1..382f631 100644 --- a/modules/objdetect/src/matching.cpp +++ b/modules/objdetect/src/matching.cpp @@ -1396,7 +1396,7 @@ static int createSchedule(const CvLSVMFeaturePyramid *H, const CvLSVMFilterObjec const int n, const int bx, const int by, const int threadsNum, int *kLevels, int **processingLevels) { - int rootFilterDim, sumPartFiltersDim, i, numLevels, dbx, dby, numDotProducts; + int rootFilterDim, sumPartFiltersDim, i, numLevels, dbx, dby; int j, minValue, argMin, lambda, maxValue, k; int *dotProd, *weights, *disp; if (H == NULL || all_F == NULL) @@ -1420,8 +1420,6 @@ static int createSchedule(const CvLSVMFeaturePyramid *H, const CvLSVMFilterObjec // of feature map with part filter dbx = 2 * bx; dby = 2 * by; - // Total number of dot products for all levels - numDotProducts = 0; lambda = LAMBDA; for (i = 0; i < numLevels; i++) { @@ -1429,7 +1427,6 @@ static int createSchedule(const CvLSVMFeaturePyramid *H, const CvLSVMFilterObjec H->pyramid[i + lambda]->sizeY * rootFilterDim + (H->pyramid[i]->sizeX + dbx) * (H->pyramid[i]->sizeY + dby) * sumPartFiltersDim; - numDotProducts += dotProd[i]; } // Allocation memory for saving dot product number performed by each thread weights = (int *)malloc(sizeof(int) * threadsNum); diff --git a/modules/ocl/src/arithm.cpp b/modules/ocl/src/arithm.cpp index de8f434..e9e82b9 100644 --- a/modules/ocl/src/arithm.cpp +++ b/modules/ocl/src/arithm.cpp @@ -2205,7 +2205,6 @@ void cv::ocl::transpose(const oclMat &src, oclMat &dst) CV_Assert(src.type() == CV_8UC1 || src.type() == CV_8UC3 || src.type() == CV_8UC4 || src.type() == CV_8SC3 || src.type() == CV_8SC4 || src.type() == CV_16UC2 || src.type() == CV_16SC2 || src.type() == CV_32SC1 || src.type() == CV_32FC1); - stringstream idxstr; oclMat emptyMat; if( src.data == dst.data && dst.cols == dst.rows )