Merge pull request #434 from taka-no-me:fix_parallel_writer_test

bf575ba7 · Andrey Kamaev · OpenCV Buildbot · 7cdede0c · 3c39e146 · bf575ba7
Commit bf575ba7 authored Feb 06, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Feb 06, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

test_ffmpeg.cpp modules/highgui/test/test_ffmpeg.cpp +6 -2

No files found.
--- a/modules/highgui/test/test_ffmpeg.cpp
+++ b/modules/highgui/test/test_ffmpeg.cpp
@@ -241,7 +241,9 @@ public:

    virtual void operator() (const Range& range) const
    {
-        CV_Assert((range.start + 1) == range.end);
+        if((range.start + 1) != range.end)
+            return;
+
        VideoWriter* writer = writers->operator[](range.start);
        CV_Assert(writer != NULL);
        CV_Assert(writer->isOpened());
@@ -303,7 +305,9 @@ public:

    virtual void operator() (const Range& range) const
    {
-        CV_Assert(range.start + 1 == range.end);
+        if((range.start + 1) != range.end)
+            return;
+
        VideoCapture* capture = readers->operator[](range.start);
        CV_Assert(capture != NULL);
        CV_Assert(capture->isOpened());