Merge pull request #1906 from asmorkalov:android_ocl_warn_fix

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

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"