From 91a027043208ccf692b5d30c695f0aea76460c53 Mon Sep 17 00:00:00 2001 From: chacha21 Date: Tue, 21 Feb 2017 12:02:23 +0100 Subject: [PATCH] try to fix Android compilation --- modules/imgproc/src/drawing.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/imgproc/src/drawing.cpp b/modules/imgproc/src/drawing.cpp index 1dd436a514..dde11a7faa 100644 --- a/modules/imgproc/src/drawing.cpp +++ b/modules/imgproc/src/drawing.cpp @@ -1075,11 +1075,11 @@ EllipseEx( Mat& img, Point2l center, Size2l axes, #if (defined(i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ - defined(__arm__)) + defined(__arm__) || defined(_LITTLE_ENDIAN) || defined(LITTLE_ENDIAN)) # define OPENCV_BYTEORDER 1234 # define OPENCV_BIGENDIAN 0 # define OPENCV_LITTLEENDIAN 1 -#elif (defined(sparc) || defined(__ppc__)) +#elif (defined(sparc) || defined(__ppc__) || defined(_BIG_ENDIAN) || defined(BIG_ENDIAN)) # define OPENCV_BYTEORDER 4321 # define OPENCV_BIGENDIAN 1 # define OPENCV_LITTLEENDIAN 0 @@ -1087,8 +1087,8 @@ EllipseEx( Mat& img, Point2l center, Size2l axes, #if !defined(OPENCV_BYTEORDER) static const int opencvOne = 1; -# define OPENCV_BIGENDIAN (*(char *)(&opencvOne)==0) -# define OPENCV_LITTLEENDIAN (*(char *)(&opencvOne)==1) +# define OPENCV_BIGENDIAN (*((const char *)(&opencvOne))==0) +# define OPENCV_LITTLEENDIAN (*((const char *)(&opencvOne))==1) #endif # if defined(_MSC_VER) && _MSC_VER>=1400