Commit 9a88aea6 authored by Andrey Kamaev's avatar Andrey Kamaev

Eliminated all compiler warnings on Android

parent a8f27e4a
...@@ -88,6 +88,10 @@ endif() ...@@ -88,6 +88,10 @@ endif()
add_library(${the_target} STATIC ${lib_srcs} ${lib_hdrs}) add_library(${the_target} STATIC ${lib_srcs} ${lib_hdrs})
if(CMAKE_COMPILER_IS_GNUCXX)
set_source_files_properties(tif_stream.cxx PROPERTIES COMPILE_FLAGS "-Wno-sign-compare")
endif()
set_target_properties(${the_target} set_target_properties(${the_target}
PROPERTIES PROPERTIES
OUTPUT_NAME "${the_target}" OUTPUT_NAME "${the_target}"
......
...@@ -3655,12 +3655,13 @@ public: ...@@ -3655,12 +3655,13 @@ public:
static int isInstance(const void* ptr) static int isInstance(const void* ptr)
{ {
static _ClsName dummy; static _ClsName dummy;
static void* dummyp = &dummy;
union union
{ {
const void* p; const void* p;
const void** pp; const void** pp;
} a, b; } a, b;
a.p = &dummy; a.p = dummyp;
b.p = ptr; b.p = ptr;
return *a.pp == *b.pp; return *a.pp == *b.pp;
} }
......
...@@ -32,8 +32,8 @@ public: ...@@ -32,8 +32,8 @@ public:
CvPoint ****_partsDisplacement) : CvPoint ****_partsDisplacement) :
n(_n), b(_b), maxXBorder(_maxXBorder), n(_n), b(_b), maxXBorder(_maxXBorder),
maxYBorder(_maxYBorder), scoreThreshold(_scoreThreshold), maxYBorder(_maxYBorder), scoreThreshold(_scoreThreshold),
kLevels(_kLevels), score(_score), points(_points), kPoints(_kPoints), kLevels(_kLevels), score(_score), points(_points),
partsDisplacement(_partsDisplacement) partsDisplacement(_partsDisplacement), kPoints(_kPoints)
{ {
filters = _filters; filters = _filters;
H = _H; H = _H;
......
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