Merge pull request #1332 from pengx17:2.4_fix_parallel

11 years ago · cae4480834
parent e1397f6c1f 2519a21935
commit cae4480834
1 changed files with 2 additions and 2 deletions
--- a/modules/core/src/parallel.cpp
+++ b/modules/core/src/parallel.cpp
@ -144,9 +144,9 @@ namespace
        {
            cv::Range r;
            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 +
-                            ((size_t)sr.end*(wholeRange.end - wholeRange.start) + nstripes/2)/nstripes);
+                            ((uint64)sr.end*(wholeRange.end - wholeRange.start) + nstripes/2)/nstripes);
            (*body)(r);
        }
        cv::Range stripeRange() const { return cv::Range(0, nstripes); }