diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp index cda2c33974..0528ce2122 100644 --- a/modules/core/src/matrix.cpp +++ b/modules/core/src/matrix.cpp @@ -1145,7 +1145,7 @@ Size _InputArray::size(int i) const const std::vector& v = *(const std::vector*)obj; const std::vector& iv = *(const std::vector*)obj; size_t szb = v.size(), szi = iv.size(); - return szb == szi ? Size(1, (int)szb) : Size(1, (int)(szb/CV_ELEM_SIZE(flags))); + return szb == szi ? Size((int)szb, 1) : Size((int)(szb/CV_ELEM_SIZE(flags)), 1); } if( k == NONE ) @@ -1155,19 +1155,19 @@ Size _InputArray::size(int i) const { const std::vector >& vv = *(const std::vector >*)obj; if( i < 0 ) - return vv.empty() ? Size() : Size(1, (int)vv.size()); + return vv.empty() ? Size() : Size((int)vv.size(), 1); CV_Assert( i < (int)vv.size() ); const std::vector >& ivv = *(const std::vector >*)obj; size_t szb = vv[i].size(), szi = ivv[i].size(); - return szb == szi ? Size(1, (int)szb) : Size(1, (int)(szb/CV_ELEM_SIZE(flags))); + return szb == szi ? Size((int)szb, 1) : Size((int)(szb/CV_ELEM_SIZE(flags)), 1); } if( k == STD_VECTOR_MAT ) { const std::vector& vv = *(const std::vector*)obj; if( i < 0 ) - return vv.empty() ? Size() : Size(1, (int)vv.size()); + return vv.empty() ? Size() : Size((int)vv.size(), 1); CV_Assert( i < (int)vv.size() ); return vv[i].size(); diff --git a/modules/core/test/test_operations.cpp b/modules/core/test/test_operations.cpp index 09d5f0575c..6b36883cfe 100644 --- a/modules/core/test/test_operations.cpp +++ b/modules/core/test/test_operations.cpp @@ -487,7 +487,7 @@ bool CV_OperationsTest::TestSubMatAccess() coords.push_back(T_bs(i)); //std::cout << T_bs1(i) << std::endl; } - CV_Assert( norm(coords, T_bs.reshape(1,1).t(), NORM_INF) == 0 ); + CV_Assert( norm(coords, T_bs.reshape(1,1), NORM_INF) == 0 ); } catch (const test_excep& e) {