Skip to content

O
opencv
Commit 532885c1 authored by Maksim Shabunin's avatar Maksim Shabunin
Browse files
Options

Merge pull request #6607 from alalek:issue_6604

parents 89a1e806 ff0601cd
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 8 deletions
modules/core/include/opencv2/core/cvstd.hpp
View file @ 532885c1
......@@ -67,6 +67,11 @@
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::max;
using std::abs;
......@@ -77,14 +82,6 @@ namespace cv
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
namespace cv
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment