From eab7603096beef3b9f25b5ec9a6c453c5938e97e Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Mon, 2 Dec 2013 17:48:27 +0400
Subject: [PATCH] Warning fixes and suppression in ocl module for gcc 4.6 from
 Android NDK.

---
 modules/ocl/src/haar.cpp           | 2 +-
 modules/ocl/src/mssegmentation.cpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/ocl/src/haar.cpp b/modules/ocl/src/haar.cpp
index deff8671e..25d376a4e 100644
--- a/modules/ocl/src/haar.cpp
+++ b/modules/ocl/src/haar.cpp
@@ -923,7 +923,7 @@ CvSeq *cv::ocl::OclCascadeClassifier::oclHaarDetectObjects( oclMat &gimg, CvMemS
                 //use known local data stride to precalulate indexes
                 int DATA_SIZE_X = (localThreads[0]+cascade->orig_window_size.width);
                 // check that maximal value is less than maximal unsigned short
-                assert(DATA_SIZE_X*cascade->orig_window_size.height+cascade->orig_window_size.width < USHRT_MAX);
+                assert(DATA_SIZE_X*cascade->orig_window_size.height+cascade->orig_window_size.width < (int)USHRT_MAX);
                 for(int i = 0;i<nodenum;++i)
                 {//process each node from classifier
                     struct NodePK
diff --git a/modules/ocl/src/mssegmentation.cpp b/modules/ocl/src/mssegmentation.cpp
index 865c5f71e..5edca3e2f 100644
--- a/modules/ocl/src/mssegmentation.cpp
+++ b/modules/ocl/src/mssegmentation.cpp
@@ -42,6 +42,10 @@
 //
 //M*/
 
+#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 6)
+# pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
+
 #include "precomp.hpp"
 #include "opencl_kernels.hpp"