Skip to content

Commit 2bbe9c7

Browse files
committed
some more potential fixes (even though manually patching dims is a bad style, need to fix to properly).
1 parent d6622fa commit 2bbe9c7

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

modules/gapi/src/api/gbackend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ void createMat(const cv::GMatDesc &desc, cv::Mat& mat)
411411
#if !defined(GAPI_STANDALONE)
412412
// NB: WA for 1D mats.
413413
if (desc.dims.size() == 1u) {
414-
mat.dims = 1;
414+
mat.size.dims = mat.dims = 1;
415415
}
416416
#endif
417417
}

modules/gapi/test/gapi_sample_pipelines.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ TEST(DISABLED_GAPI_Pipeline, 1DMatBetweenIslands)
512512
cv::Mat out_mat;
513513

514514
cv::Mat ref_mat({dim}, CV_8U);
515-
ref_mat.dims = 1;
515+
ref_mat.size.dims = ref_mat.dims = 1;
516516
ref_mat.setTo(0);
517517

518518
cv::GMat in;
@@ -534,7 +534,7 @@ TEST(DISABLED_GAPI_Pipeline, 1DMatWithinSingleIsland)
534534
cv::Mat out_mat;
535535

536536
cv::Mat ref_mat({dim}, CV_8U);
537-
ref_mat.dims = 1;
537+
ref_mat.size.dims = ref_mat.dims = 1;
538538
ref_mat.setTo(0);
539539

540540
cv::GMat in;

modules/gapi/test/rmat/rmat_view_tests.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ TEST_P(RMatViewNDTest, DefaultStep) {
7676
std::tie(depth, ndims) = GetParam();
7777
std::vector<int> dims(ndims, 12);
7878
GMatDesc desc;
79-
desc.dims = dims;
79+
desc.size.dims = desc.dims = dims;
8080
desc.depth = depth;
8181
GAPI_Assert(desc.chan == -1);
8282
auto elemSize = CV_ELEM_SIZE(depth);
@@ -113,7 +113,7 @@ TEST_P(RMatViewNDTest, StepFromView) {
113113
std::vector<int> dims(ndims, 12);
114114
std::vector<int> aligned(ndims, 16);
115115
GMatDesc desc;
116-
desc.dims = dims;
116+
desc.size.dims = desc.dims = dims;
117117
desc.depth = depth;
118118
GAPI_Assert(desc.chan == -1);
119119
auto elemSize = CV_ELEM_SIZE(depth);
@@ -145,7 +145,7 @@ TEST_P(RMatViewNDTestNegative, DefaultStep) {
145145
std::tie(depth, chan, ndims) = GetParam();
146146
std::vector<int> dims(ndims, 12);
147147
GMatDesc desc;
148-
desc.dims = dims;
148+
desc.size.dims = desc.dims = dims;
149149
desc.depth = depth;
150150
desc.chan = chan;
151151
auto elemSize = CV_ELEM_SIZE(depth);

0 commit comments

Comments
 (0)