Merge pull request #15907 from rgarnov:rg/unique_ptr_for_priv_in_fluid

modules/gapi/include/opencv2/gapi/fluid/gfluidbuffer.hpp

@@ -82,10 +82,13 @@ public:
     Priv& priv();               // internal use only
     const Priv& priv() const;   // internal use only
 
-    View(Priv* p);
+    View(std::unique_ptr<Priv>&& p);
+    View(View&& v);
+    View& operator=(View&& v);
+    ~View();
 
 private:
-    std::shared_ptr<Priv> m_priv;
+    std::unique_ptr<Priv> m_priv;
     const Cache* m_cache;
 };
 
@@ -112,6 +115,8 @@ public:
            BorderOpt border);
     // Constructor for in/out buffers (for tests)
     Buffer(const cv::gapi::own::Mat &data, bool is_input);
+    ~Buffer();
+    Buffer& operator=(Buffer&&);
 
     inline uint8_t* OutLineB(int index = 0)
     {
@@ -134,13 +139,14 @@ public:
     inline const GMatDesc& meta() const { return m_cache->m_desc; }
 
     View mkView(int borderSize, bool ownStorage);
+    void addView(const View* v);
 
     class GAPI_EXPORTS Priv;      // internal use only
     Priv& priv();               // internal use only
     const Priv& priv() const;   // internal use only
 
 private:
-    std::shared_ptr<Priv> m_priv;
+    std::unique_ptr<Priv> m_priv;
     const Cache* m_cache;
 };
 

modules/gapi/include/opencv2/gapi/fluid/gfluidkernel.hpp

@@ -171,7 +171,7 @@ template<> struct fluid_get_in<cv::GMat>
 {
     static const cv::gapi::fluid::View& get(const cv::GArgs &in_args, int idx)
     {
-        return in_args[idx].unsafe_get<cv::gapi::fluid::View>();
+        return *in_args[idx].unsafe_get<cv::gapi::fluid::View*>();
     }
 };