Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request opencv#414 from asmaloney:remove-unused-vars2
  • Loading branch information
Andrey Kamaev authored and OpenCV Buildbot committed Feb 2, 2013
2 parents 7e06b47 + bc68dfb commit 2a66955
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 10 deletions.
1 change: 0 additions & 1 deletion modules/contrib/src/chamfermatching.cpp
Expand Up @@ -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());
Expand Down
2 changes: 0 additions & 2 deletions modules/gpu/src/cascadeclassifier.cpp
Expand Up @@ -771,8 +771,6 @@ NCVStatus loadFromXML(const std::string &filename,
haar.bNeedsTiltedII = false;
Ncv32u curMaxTreeDepth;

std::vector<char> xmlFileCont;

std::vector<HaarClassifierNode128> h_TmpClassifierNotRootNodes;
haarStages.resize(0);
haarClassifierNodes.resize(0);
Expand Down
3 changes: 1 addition & 2 deletions modules/imgproc/src/pyramids.cpp
Expand Up @@ -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;
Expand Down
5 changes: 1 addition & 4 deletions modules/objdetect/src/matching.cpp
Expand Up @@ -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)
Expand All @@ -1420,16 +1420,13 @@ 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++)
{
dotProd[i] = H->pyramid[i + lambda]->sizeX *
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);
Expand Down
1 change: 0 additions & 1 deletion modules/ocl/src/arithm.cpp
Expand Up @@ -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 )
Expand Down

0 comments on commit 2a66955

Please sign in to comment.