potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge pull request #11984 from mshabunin:fix-static-1

Browse Source
This commit is contained in:
Alexander Alekhin
2018-07-17 15:40:48 +00:00
parent 40b8ca2eed c473718bc2
commit 7cc84ce8ab
31 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/include/opencv2/core/mat.inl.hpp
+6 -2
View File
@@ -861,7 +861,9 @@ bool Mat::isSubmatrix() const
inline
size_t Mat::elemSize() const
{
return dims > 0 ? step.p[dims - 1] : 0;
size_t res = dims > 0 ? step.p[dims - 1] : 0;
CV_DbgAssert(res != 0);
return res;
}
inline
@@ -3789,7 +3791,9 @@ bool UMat::isSubmatrix() const
inline
size_t UMat::elemSize() const
{
return dims > 0 ? step.p[dims - 1] : 0;
size_t res = dims > 0 ? step.p[dims - 1] : 0;
CV_DbgAssert(res != 0);
return res;
}
inline