From 3c39e146a329872d839f83f5c1311badfc98924a Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 4 Feb 2013 14:34:44 +0400 Subject: [PATCH] Make parallel video writer test pass if compiled without threading support --- modules/highgui/test/test_ffmpeg.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/highgui/test/test_ffmpeg.cpp b/modules/highgui/test/test_ffmpeg.cpp index e84ef89..d3def0c 100644 --- 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()); -- 2.7.4