potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'origin/2.4' into merge-2.4

Browse Source
This commit is contained in:
Roman Donchenko
2014-06-02 13:43:28 +04:00
parent abe37659cc 9a5e9d3442
commit 33087f9eaa
5 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/contours.cpp
+1 -1
View File
@@ -1009,7 +1009,7 @@ cvFindNextContour( CvContourScanner scanner )
if( mode == CV_RETR_FLOODFILL )
{
prev = ((int*)img)[x - 1];
new_mask = INT_MIN >> 1;
new_mask = INT_MIN / 2;
}
for( ; y < height; y++, img += step )
modules/imgproc/test/test_imgwarp_strict.cpp
-1
View File
@@ -556,7 +556,6 @@ void CV_Resize_Test::resize_1d(const Mat& _src, Mat& _dst, int dy, const dim& _d
xyD[r] = 0;
for (int k = 0; k < ksize; ++k)
xyD[r] += w[k] * xyS[k * cn + r];
xyD[r] = xyD[r];
}
}
}