Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[G-API] Fix issue of getting 1D Mat out of RMat::View #21103

Merged
merged 3 commits into from Nov 26, 2021
Merged

[G-API] Fix issue of getting 1D Mat out of RMat::View #21103

merged 3 commits into from Nov 26, 2021

Conversation

OrestChura
Copy link
Contributor

@OrestChura OrestChura commented Nov 23, 2021 •
edited

  • fixed issue due to auto-changing mat.dims to 2 in cv::Mat constructors even if source Mat's dims == 1
  • added test
  • fixed for standalone too (needed changes in asView() logic)

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake
force_builders=Custom,Custom Win,Custom Mac
build_gapi_standalone:Linux x64=ade-0.1.1f
build_gapi_standalone:Win64=ade-0.1.1f
build_gapi_standalone:Mac=ade-0.1.1f
build_gapi_standalone:Linux x64 Debug=ade-0.1.1f

Xbuild_image:Custom=centos:7
Xbuildworker:Custom=linux-1
build_gapi_standalone:Custom=ade-0.1.1f

build_image:Custom=ubuntu-openvino-2021.4.1:20.04
build_image:Custom Win=openvino-2021.4.1
build_image:Custom Mac=openvino-2021.4.1

test_modules:Custom=gapi,python2,python3,java
test_modules:Custom Win=gapi,python2,python3,java
test_modules:Custom Mac=gapi,python2,python3,java

buildworker:Custom=linux-1
# disabled due high memory usage: test_opencl:Custom=ON
test_opencl:Custom=OFF
test_bigdata:Custom=1
test_filter:Custom=*

@OrestChura
Fix issue of getting 1D Mat out of RMat::View
4d6fa60 
 - added test
 - fixed for standalone too (removed Assert(dims.empty()))
alalek
alalek reviewed Nov 23, 2021
View reviewed changes
Copy link
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

relates #18594

modules/gapi/src/backends/common/gbackend.hpp
m.dims = 1;
}
return m;
}
#else
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps #else part should be fixed too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, there are changes for standalone to support 1D, but not here they are required (as local testing shows)

Added standalone changes in asView()

mpashchenkov
mpashchenkov approved these changes Nov 26, 2021
View reviewed changes
Copy link
Contributor

@mpashchenkov mpashchenkov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like truth.

@dmatveev dmatveev added this to the 4.5.5 milestone Nov 26, 2021
rgarnov
rgarnov approved these changes Nov 26, 2021
View reviewed changes
Copy link
Contributor

@rgarnov rgarnov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks!

@OrestChura OrestChura removed the request for review from TolyaTalamanov November 26, 2021 14:47
@alalek alalek merged commit e20fe42 into opencv:4.x Nov 26, 2021
@alalek alalek mentioned this pull request Dec 30, 2021
Merged
@alalek alalek mentioned this pull request Feb 22, 2022
Merged
a-sajjad72 pushed a commit to a-sajjad72/opencv that referenced this pull request Mar 30, 2023
@OrestChura
Merge pull request opencv#21103 from OrestChura:oc/fix_1D_Mat_RMat_Vi…
5c0e4e3 
…ew_issue

[G-API] Fix issue of getting 1D Mat out of RMat::View

* Fix issue of getting 1D Mat out of RMat::View
 - added test
 - fixed for standalone too (removed Assert(dims.empty()))

* Fixed asVeiw() function for standalone

* Put more detailed comment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alalek alalek alalek left review comments

@rgarnov rgarnov rgarnov approved these changes

@mpashchenkov mpashchenkov mpashchenkov approved these changes

Assignees

@rgarnov rgarnov

Labels
category: g-api / gapi
Projects
None yet
Milestone
4.5.5
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@OrestChura @alalek @rgarnov @mpashchenkov @dmatveev