Merge pull request #2771 from SpecLad:pvs-checks-opencv

pull/2819/head^2
Roman Donchenko 11 years ago committed by OpenCV Buildbot
commit 9a5e9d3442
  1. 2
      modules/core/test/test_math.cpp
  2. 2
      modules/imgproc/src/contours.cpp
  3. 1
      modules/imgproc/test/test_imgwarp_strict.cpp

@ -1353,7 +1353,7 @@ void Core_DetTest::get_test_array_types_and_sizes( int test_case_idx, vector<vec
{ {
Base::get_test_array_types_and_sizes( test_case_idx, sizes, types ); Base::get_test_array_types_and_sizes( test_case_idx, sizes, types );
sizes[INPUT][0].width = sizes[INPUT][0].height = sizes[INPUT][0].height; sizes[INPUT][0].width = sizes[INPUT][0].height;
sizes[TEMP][0] = sizes[INPUT][0]; sizes[TEMP][0] = sizes[INPUT][0];
types[TEMP][0] = CV_64FC1; types[TEMP][0] = CV_64FC1;
} }

@ -1009,7 +1009,7 @@ cvFindNextContour( CvContourScanner scanner )
if( mode == CV_RETR_FLOODFILL ) if( mode == CV_RETR_FLOODFILL )
{ {
prev = ((int*)img)[x - 1]; prev = ((int*)img)[x - 1];
new_mask = INT_MIN >> 1; new_mask = INT_MIN / 2;
} }
for( ; y < height; y++, img += step ) for( ; y < height; y++, img += step )

@ -557,7 +557,6 @@ void CV_Resize_Test::resize_1d(const Mat& _src, Mat& _dst, int dy, const dim& _d
xyD[r] = 0; xyD[r] = 0;
for (int k = 0; k < ksize; ++k) for (int k = 0; k < ksize; ++k)
xyD[r] += w[k] * xyS[k * cn + r]; xyD[r] += w[k] * xyS[k * cn + r];
xyD[r] = xyD[r];
} }
} }
} }

Loading…
Cancel
Save