generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1332 from pengx17:2.4_fix_parallel

Browse Source
This commit is contained in:
Roman Donchenko 2013-08-23 14:47:48 +04:00 committed by OpenCV Buildbot
commit cae4480834
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/parallel.cpp
View File

@ -144,9 +144,9 @@ namespace
{ {
cv::Range r; cv::Range r;
r.start = (int)(wholeRange.start + r.start = (int)(wholeRange.start +
((size_t)sr.start*(wholeRange.end - wholeRange.start) + nstripes/2)/nstripes); ((uint64)sr.start*(wholeRange.end - wholeRange.start) + nstripes/2)/nstripes);
r.end = sr.end >= nstripes ? wholeRange.end : (int)(wholeRange.start + r.end = sr.end >= nstripes ? wholeRange.end : (int)(wholeRange.start +
((size_t)sr.end*(wholeRange.end - wholeRange.start) + nstripes/2)/nstripes); ((uint64)sr.end*(wholeRange.end - wholeRange.start) + nstripes/2)/nstripes);
(*body)(r); (*body)(r);
} }
cv::Range stripeRange() const { return cv::Range(0, nstripes); } cv::Range stripeRange() const { return cv::Range(0, nstripes); }