Skip to content

Commit c60fde0

Browse files
committed
Merge pull request #3435 from asmorkalov:as/xcode_warning_supression3.4
2 parents f18f127 + 2abfef7 commit c60fde0

File tree

7 files changed

+1
-31
lines changed

7 files changed

+1
-31
lines changed

modules/ccalib/src/ccalib.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -247,23 +247,16 @@ void CustomPattern::check_matches(vector<Point2f>& matched, const vector<Point2f
247247
perspectiveTransform(pattern, proj, H);
248248

249249
int deleted = 0;
250-
double error_sum = 0;
251-
double error_sum_filtered = 0;
252250
for (uint i = 0; i < proj.size(); ++i)
253251
{
254252
double error = norm(matched[i] - proj[i]);
255-
error_sum += error;
256253
if (error >= MAX_PROJ_ERROR_PX)
257254
{
258255
deleteStdVecElem(good, i);
259256
deleteStdVecElem(matched, i);
260257
deleteStdVecElem(pattern_3d, i);
261258
++deleted;
262259
}
263-
else
264-
{
265-
error_sum_filtered += error;
266-
}
267260
}
268261
}
269262

modules/line_descriptor/src/binary_descriptor_matcher.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -644,9 +644,6 @@ void BinaryDescriptorMatcher::Mihasher::query( UINT32* results, UINT32* numres,
644644

645645
/* counting everything retrieved (duplicates are counted multiple times)
646646
number of lookups (and xors) */
647-
UINT32 nl = 0;
648-
649-
UINT32 nd = 0;
650647
UINT32 *arr;
651648
int size = 0;
652649
UINT32 index;
@@ -672,8 +669,6 @@ void BinaryDescriptorMatcher::Mihasher::query( UINT32* results, UINT32* numres,
672669
else
673670
curb = b - 1;
674671
UINT64 chunksk = chunks[k];
675-
/* number of bit-strings with s number of 1s */
676-
nl += xornum[s + 1] - xornum[s];
677672

678673
/* the bit-string with s number of 1s */
679674
UINT64 bitstr = 0;
@@ -706,7 +701,6 @@ void BinaryDescriptorMatcher::Mihasher::query( UINT32* results, UINT32* numres,
706701
arr = H[k].query( chunksk ^ bitstr, &size ); // lookup
707702
if( size )
708703
{ /* the corresponding bucket is not empty */
709-
nd += size;
710704
for ( int c = 0; c < size; c++ )
711705
{
712706
index = arr[c];

modules/stereo/src/stereo_binary_bm.cpp

-8
Original file line numberDiff line numberDiff line change
@@ -342,14 +342,6 @@ namespace cv
342342

343343
Mat left = preFilteredImg0, right = preFilteredImg1;
344344

345-
int ndisp = params.numDisparities;
346-
347-
int wsz = params.kernelSize;
348-
int bufSize0 = (int)((ndisp + 2)*sizeof(int));
349-
bufSize0 += (int)((height + wsz + 2)*ndisp*sizeof(int));
350-
bufSize0 += (int)((height + wsz + 2)*sizeof(int));
351-
bufSize0 += (int)((height + wsz + 2)*ndisp*(wsz + 2)*sizeof(uchar) + 256);
352-
353345
int bufSize1 = (int)((width + params.preFilterSize + 2) * sizeof(int) + 256);
354346
if(params.usePrefilter == true)
355347
{

modules/structured_light/src/graycodepattern.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,6 @@ bool GrayCodePattern_Impl::decode( const std::vector< std::vector<Mat> >& patter
259259
Mat& disparityMap_ = *( Mat* ) disparityMap.getObj();
260260
disparityMap_ = Mat( cam_height, cam_width, CV_64F, double( 0 ) );
261261

262-
double number_of_pixels_cam1 = 0;
263-
double number_of_pixels_cam2 = 0;
264-
265262
for( int i = 0; i < params.width; i++ )
266263
{
267264
for( int j = 0; j < params.height; j++ )
@@ -278,8 +275,6 @@ bool GrayCodePattern_Impl::decode( const std::vector< std::vector<Mat> >& patter
278275
double sump1x = 0;
279276
double sump2x = 0;
280277

281-
number_of_pixels_cam1 += cam1Pixs.size();
282-
number_of_pixels_cam2 += cam2Pixs.size();
283278
for( int c1 = 0; c1 < (int) cam1Pixs.size(); c1++ )
284279
{
285280
p1 = cam1Pixs[c1];

modules/tracking/src/multiTracker.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ namespace cv
266266
Mat tmp;
267267
int dx = initSize.width / 10, dy = initSize.height / 10;
268268
Size2d size = img.size();
269-
double scale = 1.0;
270269
int npos = 0, nneg = 0;
271270
double maxSc = -5.0;
272271
Rect2d maxScRect;
@@ -335,7 +334,6 @@ namespace cv
335334
scaleID++;
336335
size.width /= tld::SCALE_STEP;
337336
size.height /= tld::SCALE_STEP;
338-
scale *= tld::SCALE_STEP;
339337
resize(img, tmp, size, 0, 0, tld::DOWNSCALE_MODE);
340338
resized_imgs.push_back(tmp);
341339
GaussianBlur(resized_imgs[scaleID], tmp, tld::GaussBlurKernelSize, 0.0f);

modules/tracking/src/tldDetector.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ namespace cv
363363
Mat tmp;
364364
int dx = initSize.width / 10, dy = initSize.height / 10;
365365
Size2d size = img.size();
366-
double scale = 1.0;
367366
int npos = 0, nneg = 0;
368367
double maxSc = -5.0;
369368
Rect2d maxScRect;
@@ -398,7 +397,6 @@ namespace cv
398397
scaleID++;
399398
size.width /= SCALE_STEP;
400399
size.height /= SCALE_STEP;
401-
scale *= SCALE_STEP;
402400
resize(img, tmp, size, 0, 0, DOWNSCALE_MODE);
403401
resized_imgs.push_back(tmp);
404402
GaussianBlur(resized_imgs[scaleID], tmp, GaussBlurKernelSize, 0.0f);

modules/ximgproc/src/brightedges.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ namespace cv
150150
iedge.ptr(row + 1)[col + 2] +
151151
iedge.ptr(row - 1)[col + 2];
152152
if (line < weight) lines += 1;
153-
if (line == 1) return 0;
153+
if (lines == 1) return 0;
154154
// Compute surrounding pixels for dark zone
155155
int surround = iedge.ptr(row - 1)[col - 1] +
156156
iedge.ptr(row - 1)[col] +

0 commit comments

Comments
 (0)