mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 12:22:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

gapi: fix build

Browse Source 
- gcc 4.8.4 (ARMv7)
This commit is contained in:
Alexander Alekhin 2019-10-22 16:31:40 +03:00
parent 2477103707
commit fe4f27b99b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gapi/include/opencv2/gapi/ocl/goclkernel.hpp
View File

@ -119,7 +119,7 @@ template<class T> struct ocl_get_in
struct tracked_cv_umat{ struct tracked_cv_umat{
//TODO Think if T - API could reallocate UMat to a proper size - how do we handle this ? //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{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. cv::UMat &r; // FIXME: It was a value (not a reference) before.
// Actually OCL backend should allocate its internal data! // Actually OCL backend should allocate its internal data!
uchar* original_data; uchar* original_data;

2
modules/gapi/src/executor/gstreamingexecutor.cpp
View File

@ -546,7 +546,7 @@ void cv::gimpl::GStreamingExecutor::setSource(GRunArgs &&ins)
return util::holds_alternative<cv::gapi::wip::IStreamSource::Ptr>(arg); return util::holds_alternative<cv::gapi::wip::IStreamSource::Ptr>(arg);
}; };
const auto num_videos = std::count_if(ins.begin(), ins.end(), is_video); 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 // See below why (another reason - no documented behavior
// on handling videos streams of different length) // on handling videos streams of different length)