potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages 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
parent 91775af2dd b03dd764a1
commit ff9820ea5c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/umatrix.cpp
+2 -2
View File
@@ -1062,7 +1062,7 @@ UMat UMat::reshape(int _cn, int _newndims, const int* _newsz) const
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)
_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 = _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++)
{