mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 06:26:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #26251 from asmorkalov:as/reshape_umat_0d

Browse Source 
Relax conditions to allow 0d reshape for UMat.
This commit is contained in:
Alexander Smorkalov 2024-10-04 20:27:29 +03:00 committed by GitHub
commit ff9820ea5c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/umatrix.cpp
View File

@ -1062,7 +1062,7 @@ UMat UMat::reshape(int _cn, int _newndims, const int* _newsz) const
if (isContinuous()) if (isContinuous())
{ {
CV_Assert(_cn >= 0 && _newndims > 0 && _newndims <= CV_MAX_DIM && _newsz); CV_Assert(_cn >= 0 && _newndims >= 0 && _newndims <= CV_MAX_DIM && _newsz);
if (_cn == 0) if (_cn == 0)
_cn = this->channels(); _cn = this->channels();
@ -1072,7 +1072,7 @@ UMat UMat::reshape(int _cn, int _newndims, const int* _newsz) const
size_t total_elem1_ref = this->total() * this->channels(); size_t total_elem1_ref = this->total() * this->channels();
size_t total_elem1 = _cn; size_t total_elem1 = _cn;
AutoBuffer<int, 4> newsz_buf( (size_t)_newndims ); AutoBuffer<int, 4> newsz_buf( (size_t)std::max(_newndims, 1) );
for (int i = 0; i < _newndims; i++) for (int i = 0; i < _newndims; i++)
{ {