From fe4f27b99b6fff49b3c22ca91e7f04038c15b77a Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 22 Oct 2019 16:31:40 +0300 Subject: [PATCH] gapi: fix build - gcc 4.8.4 (ARMv7) --- modules/gapi/include/opencv2/gapi/ocl/goclkernel.hpp | 2 +- modules/gapi/src/executor/gstreamingexecutor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gapi/include/opencv2/gapi/ocl/goclkernel.hpp b/modules/gapi/include/opencv2/gapi/ocl/goclkernel.hpp index e409652ed2..4a490aaa89 100644 --- a/modules/gapi/include/opencv2/gapi/ocl/goclkernel.hpp +++ b/modules/gapi/include/opencv2/gapi/ocl/goclkernel.hpp @@ -119,7 +119,7 @@ template struct ocl_get_in struct tracked_cv_umat{ //TODO Think if T - API could reallocate UMat to a proper size - how do we handle this ? //tracked_cv_umat(cv::UMat& m) : r{(m)}, original_data{m.getMat(ACCESS_RW).data} {} - tracked_cv_umat(cv::UMat& m) : r{ (m) }, original_data{ nullptr } {} + tracked_cv_umat(cv::UMat& m) : r(m), original_data{ nullptr } {} cv::UMat &r; // FIXME: It was a value (not a reference) before. // Actually OCL backend should allocate its internal data! uchar* original_data; diff --git a/modules/gapi/src/executor/gstreamingexecutor.cpp b/modules/gapi/src/executor/gstreamingexecutor.cpp index cd5f1452ca..8d67d1def6 100644 --- a/modules/gapi/src/executor/gstreamingexecutor.cpp +++ b/modules/gapi/src/executor/gstreamingexecutor.cpp @@ -546,7 +546,7 @@ void cv::gimpl::GStreamingExecutor::setSource(GRunArgs &&ins) return util::holds_alternative(arg); }; const auto num_videos = std::count_if(ins.begin(), ins.end(), is_video); - if (num_videos > 1u) + if (num_videos > 1) { // See below why (another reason - no documented behavior // on handling videos streams of different length)