mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 22:44:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6607 from alalek:issue_6604

Browse Source
This commit is contained in:
Maksim Shabunin 2016-06-06 09:20:57 +00:00
commit 532885c12b
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/core/include/opencv2/core/cvstd.hpp
View File

@ -67,6 +67,11 @@
namespace cv namespace cv
{ {
static inline uchar abs(uchar a) { return a; }
static inline ushort abs(ushort a) { return a; }
static inline unsigned abs(unsigned a) { return a; }
static inline uint64 abs(uint64 a) { return a; }
using std::min; using std::min;
using std::max; using std::max;
using std::abs; using std::abs;
@ -77,14 +82,6 @@ namespace cv
using std::log; using std::log;
} }
namespace std
{
static inline uchar abs(uchar a) { return a; }
static inline ushort abs(ushort a) { return a; }
static inline unsigned abs(unsigned a) { return a; }
static inline uint64 abs(uint64 a) { return a; }
}
#else #else
namespace cv namespace cv
{ {