generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1906 from asmorkalov:android_ocl_warn_fix

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-12-03 11:20:48 +04:00 committed by OpenCV Buildbot
commit 8db6d9f9b2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ocl/src/haar.cpp
View File

@ -923,7 +923,7 @@ CvSeq *cv::ocl::OclCascadeClassifier::oclHaarDetectObjects( oclMat &gimg, CvMemS
//use known local data stride to precalulate indexes //use known local data stride to precalulate indexes
int DATA_SIZE_X = (localThreads[0]+cascade->orig_window_size.width); int DATA_SIZE_X = (localThreads[0]+cascade->orig_window_size.width);
// check that maximal value is less than maximal unsigned short // 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) for(int i = 0;i<nodenum;++i)
{//process each node from classifier {//process each node from classifier
struct NodePK struct NodePK

4
modules/ocl/src/mssegmentation.cpp
View File

@ -42,6 +42,10 @@
// //
//M*/ //M*/
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 6)
# pragma GCC diagnostic ignored "-Warray-bounds"
#endif
#include "precomp.hpp" #include "precomp.hpp"
#include "opencl_kernels.hpp" #include "opencl_kernels.hpp"