Commit 8ab22474 authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot

Merge pull request #2603 from maksqwe:unused_fix_2.4

parents dae04aac eb89f520
...@@ -1363,7 +1363,6 @@ TEST_P(ElemWiseTest, accuracy) ...@@ -1363,7 +1363,6 @@ TEST_P(ElemWiseTest, accuracy)
op->op(src, dst, mask); op->op(src, dst, mask);
double maxErr = op->getMaxErr(depth); 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"; ASSERT_PRED_FORMAT2(cvtest::MatComparator(maxErr, op->context), dst0, dst) << "\nsrc[0] ~ " << cvtest::MatInfo(!src.empty() ? src[0] : Mat()) << "\ntestCase #" << testIdx << "\n";
} }
} }
......
...@@ -214,8 +214,6 @@ int CV_KDTreeTest_CPP::findNeighbors( Mat& points, Mat& neighbors ) ...@@ -214,8 +214,6 @@ int CV_KDTreeTest_CPP::findNeighbors( Mat& points, Mat& neighbors )
const int emax = 20; const int emax = 20;
Mat neighbors2( neighbors.size(), CV_32SC1 ); Mat neighbors2( neighbors.size(), CV_32SC1 );
int j; 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++ ) for( int pi = 0; pi < points.rows; pi++ )
{ {
// 1st way // 1st way
......
...@@ -778,8 +778,6 @@ NCVStatus loadFromXML(const std::string &filename, ...@@ -778,8 +778,6 @@ NCVStatus loadFromXML(const std::string &filename,
haar.bNeedsTiltedII = false; haar.bNeedsTiltedII = false;
Ncv32u curMaxTreeDepth; Ncv32u curMaxTreeDepth;
std::vector<char> xmlFileCont;
std::vector<HaarClassifierNode128> h_TmpClassifierNotRootNodes; std::vector<HaarClassifierNode128> h_TmpClassifierNotRootNodes;
haarStages.resize(0); haarStages.resize(0);
haarClassifierNodes.resize(0); haarClassifierNodes.resize(0);
......
...@@ -2651,7 +2651,6 @@ void HOGDescriptor::groupRectangles(vector<cv::Rect>& rectList, vector<double>& ...@@ -2651,7 +2651,6 @@ void HOGDescriptor::groupRectangles(vector<cv::Rect>& rectList, vector<double>&
vector<cv::Rect_<double> > rrects(nclasses); vector<cv::Rect_<double> > rrects(nclasses);
vector<int> numInClass(nclasses, 0); vector<int> numInClass(nclasses, 0);
vector<double> foundWeights(nclasses, DBL_MIN); vector<double> foundWeights(nclasses, DBL_MIN);
vector<double> totalFactorsPerClass(nclasses, 1);
int i, j, nlabels = (int)labels.size(); int i, j, nlabels = (int)labels.size();
for( i = 0; i < nlabels; i++ ) for( i = 0; i < nlabels; i++ )
......
...@@ -630,7 +630,6 @@ typedef TestBaseWithParam<Size> CLAHEFixture; ...@@ -630,7 +630,6 @@ typedef TestBaseWithParam<Size> CLAHEFixture;
OCL_PERF_TEST_P(CLAHEFixture, CLAHE, OCL_TEST_SIZES) OCL_PERF_TEST_P(CLAHEFixture, CLAHE, OCL_TEST_SIZES)
{ {
const Size srcSize = GetParam(); const Size srcSize = GetParam();
const string impl = getSelectedImpl();
Mat src(srcSize, CV_8UC1), dst; Mat src(srcSize, CV_8UC1), dst;
const double clipLimit = 40.0; const double clipLimit = 40.0;
......
...@@ -110,7 +110,6 @@ static void findCorners_caller( ...@@ -110,7 +110,6 @@ static void findCorners_caller(
oclMat& counter) //output value with number of detected corners, have to be 0 before call oclMat& counter) //output value with number of detected corners, have to be 0 before call
{ {
string opt; string opt;
std::vector<int> k;
Context * cxt = Context::getContext(); Context * cxt = Context::getContext();
std::vector< std::pair<size_t, const void*> > args; std::vector< std::pair<size_t, const void*> > args;
......
...@@ -266,7 +266,7 @@ namespace cv ...@@ -266,7 +266,7 @@ namespace cv
int src_step = (int)(src.step/src.elemSize()); int src_step = (int)(src.step/src.elemSize());
int dstm_step = (int)(dst_m.step/dst_m.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_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.rows ));
args.push_back( make_pair( sizeof(cl_int) , (void *)&src.cols )); args.push_back( make_pair( sizeof(cl_int) , (void *)&src.cols ));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment