mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 03:00:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16130 from alalek:fix_build_gapi_gcc_4.x

Browse Source
This commit is contained in:
Alexander Alekhin 2019-12-11 14:17:03 +00:00
commit 121bc50ca9
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/gapi/src/backends/fluid/gfluidbuffer.cpp
View File

@ -347,12 +347,20 @@ std::unique_ptr<fluid::BufferStorage> createStorage(int capacity, int desc_width
std::unique_ptr<fluid::BufferStorageWithBorder> storage(new BufferStorageWithBorder);
storage->init(type, border_size, border.value());
storage->create(capacity, desc_width, type);
#if defined __GNUC__ && __GNUC__ < 5
return std::move(storage);
#else
return storage;
#endif
}
std::unique_ptr<BufferStorageWithoutBorder> storage(new BufferStorageWithoutBorder);
storage->create(capacity, desc_width, type);
#if defined __GNUC__ && __GNUC__ < 5
return std::move(storage);
#else
return storage;
#endif
}
std::unique_ptr<BufferStorage> createStorage(const cv::gapi::own::Mat& data, cv::gapi::own::Rect roi);
@ -360,7 +368,11 @@ std::unique_ptr<BufferStorage> createStorage(const cv::gapi::own::Mat& data, cv:
{
std::unique_ptr<BufferStorageWithoutBorder> storage(new BufferStorageWithoutBorder);
storage->attach(data, roi);
#if defined __GNUC__ && __GNUC__ < 5
return std::move(storage);
#else
return storage;
#endif
}
} // namespace
} // namespace fluid