mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-17 15:20:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8107 from reunanen:fix8093

Browse Source
This commit is contained in:
Alexander Alekhin 2017-02-06 10:31:34 +00:00
commit 48f7cbec75
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/core/include/opencv2/core/types.hpp
View File

@ -1592,7 +1592,10 @@ Size_<_Tp>& Size_<_Tp>::operator = (const Size_<_Tp>& sz)
template<typename _Tp> inline template<typename _Tp> inline
_Tp Size_<_Tp>::area() const _Tp Size_<_Tp>::area() const
{ {
return width * height; const _Tp result = width * height;
CV_DbgAssert(!std::numeric_limits<_Tp>::is_integer
|| width == 0 || result / width == height); // make sure the result fits in the return value
return result;
} }
template<typename _Tp> static inline template<typename _Tp> static inline
@ -1731,7 +1734,10 @@ Size_<_Tp> Rect_<_Tp>::size() const
template<typename _Tp> inline template<typename _Tp> inline
_Tp Rect_<_Tp>::area() const _Tp Rect_<_Tp>::area() const
{ {
return width * height; const _Tp result = width * height;
CV_DbgAssert(!std::numeric_limits<_Tp>::is_integer
|| width == 0 || result / width == height); // make sure the result fits in the return value
return result;
} }
template<typename _Tp> template<typename _Tp2> inline template<typename _Tp> template<typename _Tp2> inline