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

Merge pull request #18981 from anton-potapov:fix_gnet_package_compilation_std_17

Browse Source
This commit is contained in:
Alexander Alekhin 2020-12-01 17:42:12 +00:00
commit ef0eed8d3c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gapi/include/opencv2/gapi/infer.hpp
View File

@ -418,8 +418,8 @@ struct GAPI_EXPORTS GNetParam {
* @sa cv::gapi::networks * @sa cv::gapi::networks
*/ */
struct GAPI_EXPORTS_W_SIMPLE GNetPackage { struct GAPI_EXPORTS_W_SIMPLE GNetPackage {
GAPI_WRAP GNetPackage() : GNetPackage({}) {} GAPI_WRAP GNetPackage() = default;
explicit GNetPackage(std::initializer_list<GNetParam> &&ii); explicit GNetPackage(std::initializer_list<GNetParam> ii);
std::vector<GBackend> backends() const; std::vector<GBackend> backends() const;
std::vector<GNetParam> networks; std::vector<GNetParam> networks;
}; };

4
modules/gapi/src/api/ginfer.cpp
View File

@ -16,8 +16,8 @@
#include <opencv2/gapi/infer.hpp> #include <opencv2/gapi/infer.hpp>
cv::gapi::GNetPackage::GNetPackage(std::initializer_list<GNetParam> &&ii) cv::gapi::GNetPackage::GNetPackage(std::initializer_list<GNetParam> ii)
: networks(std::move(ii)) { : networks(ii) {
} }
std::vector<cv::gapi::GBackend> cv::gapi::GNetPackage::backends() const { std::vector<cv::gapi::GBackend> cv::gapi::GNetPackage::backends() const {