Merge pull request #18473 from BioDataAnalysis:bda_fix_cv_mat_steps

4 years ago · ebe9327a92
parent a5b8f163d7 102d8f67cd
commit ebe9327a92
1 changed files with 11 additions and 4 deletions
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@ -237,12 +237,19 @@ void setSize( Mat& m, int _dims, const int* _sz, const size_t* _steps, bool auto

        if( _steps )
        {
-            if (_steps[i] % esz1 != 0)
+            if (i < _dims-1)
            {
-                CV_Error(Error::BadStep, "Step must be a multiple of esz1");
-            }
+                if (_steps[i] % esz1 != 0)
+                {
+                    CV_Error_(Error::BadStep, ("Step %zu for dimension %d must be a multiple of esz1 %zu", _steps[i], i, esz1));
+                }

-            m.step.p[i] = i < _dims-1 ? _steps[i] : esz;
+                m.step.p[i] = _steps[i];
+            }
+            else
+            {
+                m.step.p[i] = esz;
+            }
        }
        else if( autoSteps )
        {