mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 05:29:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2603 from maksqwe:unused_fix_2.4

Browse Source
This commit is contained in:
Roman Donchenko 2014-04-11 14:14:04 +04:00 committed by OpenCV Buildbot
commit 8ab224746b
7 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/test/test_arithm.cpp
View File

@ -1363,7 +1363,6 @@ TEST_P(ElemWiseTest, accuracy)
op->op(src, dst, mask);
double maxErr = op->getMaxErr(depth);
vector<int> pos;
ASSERT_PRED_FORMAT2(cvtest::MatComparator(maxErr, op->context), dst0, dst) << "\nsrc[0] ~ " << cvtest::MatInfo(!src.empty() ? src[0] : Mat()) << "\ntestCase #" << testIdx << "\n";
}
}

2
modules/features2d/test/test_nearestneighbors.cpp
View File

@ -214,8 +214,6 @@ int CV_KDTreeTest_CPP::findNeighbors( Mat& points, Mat& neighbors )
const int emax = 20;
Mat neighbors2( neighbors.size(), CV_32SC1 );
int j;
vector<float> min(points.cols, static_cast<float>(minValue));
vector<float> max(points.cols, static_cast<float>(maxValue));
for( int pi = 0; pi < points.rows; pi++ )
{
// 1st way

2
modules/gpu/src/cascadeclassifier.cpp
View File

@ -778,8 +778,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);

1
modules/objdetect/src/hog.cpp
View File

@ -2651,7 +2651,6 @@ void HOGDescriptor::groupRectangles(vector<cv::Rect>& rectList, vector<double>&
vector<cv::Rect_<double> > rrects(nclasses);
vector<int> numInClass(nclasses, 0);
vector<double> foundWeights(nclasses, DBL_MIN);
vector<double> totalFactorsPerClass(nclasses, 1);
int i, j, nlabels = (int)labels.size();
for( i = 0; i < nlabels; i++ )

1
modules/ocl/perf/perf_imgproc.cpp
View File

@ -630,7 +630,6 @@ typedef TestBaseWithParam<Size> CLAHEFixture;
OCL_PERF_TEST_P(CLAHEFixture, CLAHE, OCL_TEST_SIZES)
{
const Size srcSize = GetParam();
const string impl = getSelectedImpl();
Mat src(srcSize, CV_8UC1), dst;
const double clipLimit = 40.0;

1
modules/ocl/src/gftt.cpp
View File

@ -110,7 +110,6 @@ static void findCorners_caller(
oclMat& counter) //output value with number of detected corners, have to be 0 before call
{
string opt;
std::vector<int> k;
Context * cxt = Context::getContext();
std::vector< std::pair<size_t, const void*> > args;

4
modules/ocl/src/moments.cpp
View File

@ -266,7 +266,7 @@ namespace cv
int src_step = (int)(src.step/src.elemSize());
int dstm_step = (int)(dst_m.step/dst_m.elemSize());
vector<pair<size_t , const void *> > args,args_sum;
vector<pair<size_t , const void *> > args;
args.push_back( make_pair( sizeof(cl_mem) , (void *)&src.data ));
args.push_back( make_pair( sizeof(cl_int) , (void *)&src.rows ));
args.push_back( make_pair( sizeof(cl_int) , (void *)&src.cols ));
@ -384,4 +384,4 @@ namespace cv
return mom;
}
}
}
}