Commit e19000a5 authored by chacha21's avatar chacha21

adaptation for iOS buildbot

parent 7521bcc3
...@@ -1086,6 +1086,7 @@ EllipseEx( Mat& img, Point2l center, Size2l axes, ...@@ -1086,6 +1086,7 @@ EllipseEx( Mat& img, Point2l center, Size2l axes,
#endif #endif
#if !defined(OPENCV_BYTEORDER) #if !defined(OPENCV_BYTEORDER)
# define OPENCV_BYTEORDER 0
static const int opencvOne = 1; static const int opencvOne = 1;
# define OPENCV_BIGENDIAN (*(char *)(&opencvOne)==0) # define OPENCV_BIGENDIAN (*(char *)(&opencvOne)==0)
# define OPENCV_LITTLEENDIAN (*(char *)(&opencvOne)==1) # define OPENCV_LITTLEENDIAN (*(char *)(&opencvOne)==1)
...@@ -1143,13 +1144,15 @@ static inline uint32_t opencvLittleToHost32(const uchar* p){ ...@@ -1143,13 +1144,15 @@ static inline uint32_t opencvLittleToHost32(const uchar* p){
uint32_t x; uint32_t x;
memcpy(&x,p,4); memcpy(&x,p,4);
return _byteswap_ulong(x); return _byteswap_ulong(x);
#elif OPENCV_LITTLEENDIAN
return x;
#else #else
return ((unsigned)p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3]; return ((unsigned)p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3];
#endif #endif
} }
static inline uint32_t opencvLittleToHost32(uint32_t x){ static inline uint32_t opencvLittleToHost32(uint32_t x){
#if OPENCV_BYTEORDER==1234 #if OPENCV_LITTLEENDIAN
return x; return x;
#else #else
return opencvLittleToHost32((uchar*)&x); return opencvLittleToHost32((uchar*)&x);
......
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