third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GAPI: fix C++17 compilation errors in GNetPackage (fixes #17385)

Browse Source 
- explicitly declared default constructor
- made initilizer_list  constructor to accept the list by copy
   -- as it is  more canonical (and as copying the initializer_list does
not force copy of the list items)
   -- current version anyway does not do what it is intended to
This commit is contained in:
Anton Potapov 2020-12-01 09:34:53 +03:00
parent e726ff3296
commit 446f344818
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 {