Merge pull request #1332 from pengx17:2.4_fix_parallel

cae44808 · Roman Donchenko · OpenCV Buildbot · e1397f6c · 2519a219 · cae44808
Commit cae44808 authored Aug 23, 2013 by Roman Donchenko Committed by OpenCV Buildbot Aug 23, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

parallel.cpp modules/core/src/parallel.cpp +2 -2

No files found.
--- 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); }