fixed compile errors for MatShape/MatSize refactoring

Author: vpisarev

modules/gapi/include/opencv2/gapi/own/convert.hpp

@@ -17,8 +17,8 @@ namespace cv
 {
     template<typename T>
     std::vector<T> to_own(const cv::MatSize &sz) {
-        std::vector<T> result(sz.dims());
-        for (int i = 0; i < sz.dims(); i++) {
+        std::vector<T> result(sz.dims);
+        for (int i = 0; i < sz.dims; i++) {
             // Note: cv::MatSize is not iterable
             result[i] = static_cast<T>(sz[i]);
         }

modules/gapi/samples/onevpl_infer_with_advanced_device_selection.cpp

@@ -225,7 +225,7 @@ GAPI_OCV_KERNEL(OCVParseSSD, ParseSSD) {
                     const cv::Size &in_parent_size,
                     std::vector<cv::Rect> &out_objects) {
         const auto &in_ssd_dims = in_ssd_result.size;
-        GAPI_Assert(in_ssd_dims.dims() == 4u);
+        GAPI_Assert(in_ssd_dims.dims == 4);
 
         const int MAX_PROPOSALS = in_ssd_dims[2];
         const int OBJECT_SIZE   = in_ssd_dims[3];

modules/gapi/samples/semantic_segmentation.cpp

@@ -144,9 +144,9 @@ G_API_OP(PostProcessing, <cv::GMat(cv::GMat, cv::GMat)>, "sample.custom.post_pro
 GAPI_OCV_KERNEL(OCVPostProcessing, PostProcessing) {
     static void run(const cv::Mat &in, const cv::Mat &out_blob, cv::Mat &out) {
         int C = -1, H = -1, W = -1;
-        if (out_blob.size.dims() == 4u) {
+        if (out_blob.size.dims == 4) {
             C = 1; H = 2, W = 3;
-        } else if (out_blob.size.dims() == 3u) {
+        } else if (out_blob.size.dims == 3) {
             C = 0; H = 1, W = 2;
         } else {
             throw std::logic_error(

modules/gapi/src/api/gmat.cpp

@@ -87,7 +87,7 @@ namespace{
 #if !defined(GAPI_STANDALONE)
 cv::GMatDesc cv::descr_of(const cv::Mat &mat)
 {
-    const auto mat_dims = mat.size.dims();
+    const auto mat_dims = mat.size.dims;
 
     if (mat_dims <= 2)
         return GMatDesc{mat.depth(), mat.channels(), {mat.cols, mat.rows}};
@@ -111,7 +111,7 @@ cv::GMatDesc cv::gapi::own::descr_of(const Mat &mat)
 #if !defined(GAPI_STANDALONE)
 cv::GMatDesc cv::descr_of(const cv::UMat &mat)
 {
-    GAPI_Assert(mat.size.dims() == 2);
+    GAPI_Assert(mat.size.dims == 2);
     return GMatDesc{ mat.depth(), mat.channels(),{ mat.cols, mat.rows } };
 }
 

modules/gapi/src/backends/common/gbackend.hpp

@@ -46,9 +46,13 @@ namespace gimpl {
 #if !defined(GAPI_STANDALONE)
         int m_dims = m.dims < 2 ? 2 : m.dims;
         RMat::View::stepsT steps(m_dims);
-        const size_t* m_step = m.dims <= 2 ? m.step.buf : m.step.p;
-        for (int i = 0; i < m_dims; i++) {
-            steps[i] = m_step[i];
+        if (m_dims >= 2) {
+            for (int i = 0; i < m_dims; i++) {
+                steps[i] = m.step.p[i];
+            }
+        } else {
+            steps[1] = m.step.p[0];
+            steps[0] = m.cols*steps[1];
         }
         return RMat::View(cv::descr_of(m), m.data, steps, std::move(cb));
 #else

modules/gapi/src/backends/common/serialization.cpp

@@ -276,7 +276,7 @@ void read_mat_data(IIStream &is, cv::Mat &m) {
 
 IOStream& operator<< (IOStream& os, const cv::Mat &m) {
 #if !defined(GAPI_STANDALONE)
-    GAPI_Assert(m.size.dims() == 2 && "Only 2D images are supported now");
+    GAPI_Assert(m.size.dims == 2 && "Only 2D images are supported now");
 #else
     GAPI_Assert(m.dims.size() == 2 && "Only 2D images are supported now");
 #endif

modules/gapi/src/backends/cpu/gnnparsers.cpp

@@ -102,7 +102,7 @@ class SSDParser
         : m_dims(in_ssd_dims), m_maxProp(in_ssd_dims[2]), m_objSize(in_ssd_dims[3]),
           m_data(data), m_surface(cv::Rect({0,0}, in_size)), m_size(in_size)
     {
-        GAPI_Assert(in_ssd_dims.dims() == 4u); // Fixed output layout
+        GAPI_Assert(in_ssd_dims.dims == 4); // Fixed output layout
         GAPI_Assert(m_objSize  == 7);          // Fixed SSD object size
     }
 
@@ -220,7 +220,7 @@ void ParseSSD(const cv::Mat&  in_ssd_result,
 }
 
 static void checkYoloDims(const MatSize& dims) {
-    const auto d = dims.dims();
+    const auto d = dims.dims;
     // Accept 1x13x13xN and 13x13xN
     GAPI_Assert(d >= 2);
     if (d >= 3) {
@@ -252,7 +252,7 @@ void parseYolo(const cv::Mat&  in_yolo_result,
     const auto& dims = in_yolo_result.size;
     checkYoloDims(dims);
     int acc = 1;
-    for (int i = 0; i < dims.dims(); i++) {
+    for (int i = 0; i < dims.dims; i++) {
         acc *= dims[i];
     }
     const auto num_classes = acc/(5*13*13)-5;

modules/gapi/src/backends/ie/giebackend.cpp

@@ -236,7 +236,7 @@ cv::gapi::ie::TraitAs clarifyTrait(const cv::GMetaArg   &meta,
 
 inline IE::TensorDesc toIE(const cv::Mat &mat, cv::gapi::ie::TraitAs hint) {
     const auto &sz = mat.size;
-    if (sz.dims() == 2 && hint == cv::gapi::ie::TraitAs::IMAGE)
+    if (sz.dims == 2 && hint == cv::gapi::ie::TraitAs::IMAGE)
     {
         // NB: This logic is mainly taken from IE samples
         const size_t channels = mat.channels();
@@ -253,7 +253,7 @@ inline IE::TensorDesc toIE(const cv::Mat &mat, cv::gapi::ie::TraitAs hint) {
         return IE::TensorDesc(toIE(mat.depth()),
                               IE::SizeVector{1, channels, height, width}, bdesc);
     }
-    return IE::TensorDesc(toIE(mat.depth()), toIE(sz), toIELayout(sz.dims()));
+    return IE::TensorDesc(toIE(mat.depth()), toIE(sz), toIELayout(sz.dims));
 }
 
 // NB: Inference dimmensions always follow NCDHW order
@@ -296,7 +296,7 @@ inline IE::TensorDesc toIE(const cv::Mat               &mat,
                            const cv::gapi::ie::TraitAs hint,
                            const IE::Layout            layout) {
     const auto &sz = mat.size;
-    if (sz.dims() == 2 && hint == cv::gapi::ie::TraitAs::IMAGE)
+    if (sz.dims == 2 && hint == cv::gapi::ie::TraitAs::IMAGE)
     {
         // NB: This logic is mainly taken from IE samples
         const size_t channels = mat.channels();

modules/gapi/test/common/gapi_parsers_tests_common.hpp

@@ -48,7 +48,7 @@ class ParserSSDTest
     {
         out_boxes.clear();
         const auto &in_ssd_dims = in_ssd_result.size;
-        CV_Assert(in_ssd_dims.dims() == 4u);
+        CV_Assert(in_ssd_dims.dims == 4);
 
         const int MAX_PROPOSALS = in_ssd_dims[2];
         const int OBJECT_SIZE   = in_ssd_dims[3];
@@ -99,7 +99,7 @@ class ParserSSDTest
         out_boxes.clear();
         out_labels.clear();
         const auto &in_ssd_dims = in_ssd_result.size;
-        CV_Assert(in_ssd_dims.dims() == 4u);
+        CV_Assert(in_ssd_dims.dims == 4);
 
         const int MAX_PROPOSALS = in_ssd_dims[2];
         const int OBJECT_SIZE   = in_ssd_dims[3];

modules/gapi/test/gapi_sample_pipelines.cpp

@@ -495,13 +495,13 @@ TEST(DISABLED_GAPI_Pipeline, GraphOutputIs1DMat)
 
     // NB: Computation is able to write 1D output cv::Mat to empty out_mat.
     ASSERT_NO_THROW(cc(cv::gin(in_mat), cv::gout(out_mat)));
-    ASSERT_EQ(1, out_mat.size.dims());
+    ASSERT_EQ(1, out_mat.size.dims);
     ASSERT_EQ(dim, out_mat.size[0]);
 
     // NB: Computation is able to write 1D output cv::Mat
     // to pre-allocated with the same meta out_mat.
     ASSERT_NO_THROW(cc(cv::gin(in_mat), cv::gout(out_mat)));
-    ASSERT_EQ(1, out_mat.size.dims());
+    ASSERT_EQ(1, out_mat.size.dims);
     ASSERT_EQ(dim, out_mat.size[0]);
 }