Merge pull request #18621 from dbudniko:gapi_ww43_2020_KW_fixes

4 years ago · c3e8790dfd
parent 5ac0712cf1 dcfa23d5d2
commit c3e8790dfd
2 changed files with 3 additions and 1 deletions
--- a/modules/gapi/include/opencv2/gapi/media.hpp
+++ b/modules/gapi/include/opencv2/gapi/media.hpp
@ -51,6 +51,7 @@ public:
    View(Ptrs&& ptrs, Strides&& strs, Callback &&cb = [](){});
    View(const View&) = delete;
    View(View&&) = default;
+    View& operator = (const View&) = delete;
    ~View();

    Ptrs    ptr;
--- a/modules/gapi/test/common/gapi_core_tests_inl.hpp
+++ b/modules/gapi/test/common/gapi_core_tests_inl.hpp
@ -618,7 +618,8 @@ TEST_P(SumTest, AccuracyTest)
 #undef countNonZero
 TEST_P(CountNonZeroTest, AccuracyTest)
 {
-    int out_cnz_gapi, out_cnz_ocv;
+    int out_cnz_gapi = -1;
+    int out_cnz_ocv = -2;

    // G-API code //////////////////////////////////////////////////////////////
    cv::GMat in;