partly fixed support for 0D/scalar UMat's

opencv · Jun 16, 2023 · c5665e8 · c5665e8
1 parent a8d1402
commit c5665e8
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/modules/core/include/opencv2/core/mat.inl.hpp b/modules/core/include/opencv2/core/mat.inl.hpp
@@ -3427,9 +3427,7 @@ bool UMat::isSubmatrix() const
 inline
 size_t UMat::elemSize() const
 {
-    size_t res = dims > 0 ? step.p[dims - 1] : 0;
-    CV_DbgAssert(res != 0);
-    return res;
+    return CV_ELEM_SIZE(flags);
 }
 
 inline

diff --git a/modules/core/src/copy.cpp b/modules/core/src/copy.cpp
@@ -336,15 +336,15 @@ void Mat::copyTo( OutputArray _dst ) const
         _dst.create( dims, size.p, type(), -1, allowTransposed );
         UMat dst = _dst.getUMat();
         CV_Assert(dst.u != NULL);
-        size_t i, sz[CV_MAX_DIM] = {0}, dstofs[CV_MAX_DIM], esz = elemSize();
-        CV_Assert(dims > 0 && dims < CV_MAX_DIM);
+        size_t i, sz[CV_MAX_DIM] = {1}, dstofs[CV_MAX_DIM] = {0}, esz = elemSize();
+        CV_Assert(dims >= 0 && dims < CV_MAX_DIM);
         for( i = 0; i < (size_t)dims; i++ )
             sz[i] = size.p[i];
         int lastdim = dims >= 1 ? dims-1 : 0;
         sz[lastdim] *= esz;
         dst.ndoffset(dstofs);
         dstofs[lastdim] *= esz;
-        dst.u->currAllocator->upload(dst.u, data, dims, sz, dstofs, dst.step.p, step.p);
+        dst.u->currAllocator->upload(dst.u, data, std::max(dims, 1), sz, dstofs, dst.step.p, step.p);
         return;
     }
 

diff --git a/modules/core/src/umatrix.cpp b/modules/core/src/umatrix.cpp
@@ -1189,12 +1189,14 @@ void UMat::copyTo(OutputArray _dst) const
         return;
     }
 
-    size_t i, sz[CV_MAX_DIM] = {0}, srcofs[CV_MAX_DIM], dstofs[CV_MAX_DIM], esz = elemSize();
-    for( i = 0; i < (size_t)dims; i++ )
+    size_t sz[CV_MAX_DIM] = {1}, srcofs[CV_MAX_DIM]={0}, dstofs[CV_MAX_DIM]={0};
+    size_t esz = elemSize();
+    int i, d = std::max(dims, 1);
+    for( i = 0; i < d; i++ )
         sz[i] = size.p[i];
-    sz[dims-1] *= esz;
+    sz[d-1] *= esz;
     ndoffset(srcofs);
-    srcofs[dims-1] *= esz;
+    srcofs[d-1] *= esz;
 
     _dst.create( dims, size.p, type() );
     if( _dst.isUMat() )
@@ -1208,13 +1210,13 @@ void UMat::copyTo(OutputArray _dst) const
         {
             dst.ndoffset(dstofs);
             dstofs[dims-1] *= esz;
-            u->currAllocator->copy(u, dst.u, dims, sz, srcofs, step.p, dstofs, dst.step.p, false);
+            u->currAllocator->copy(u, dst.u, d, sz, srcofs, step.p, dstofs, dst.step.p, false);
             return;
         }
     }
 
     Mat dst = _dst.getMat();
-    u->currAllocator->download(u, dst.ptr(), dims, sz, srcofs, step.p, dst.step.p);
+    u->currAllocator->download(u, dst.ptr(), d, sz, srcofs, step.p, dst.step.p);
 }
 
 void UMat::copyTo(OutputArray _dst, InputArray _mask) const

diff --git a/modules/core/test/test_umat.cpp b/modules/core/test/test_umat.cpp
@@ -1452,4 +1452,16 @@ TEST(UMat, exceptions_refcounts_issue_20594)
     umat1.u->handle = original_handle;
 }
 
+TEST(UMat, copy_scalar)
+{
+    Mat m(0, nullptr, CV_32F), m2;
+    m.at<float>(0) = 5;
+    UMat um;
+    m.copyTo(um);
+    um.copyTo(m2);
+    EXPECT_EQ(0, m2.dims);
+    EXPECT_EQ(1, m2.cols);
+    EXPECT_EQ(5.f, m2.at<float>(0));
+}
+
 } } // namespace opencv_test::ocl