fix build warnings

This commit is contained in:
Alexander Alekhin 2018-05-17 18:29:04 +03:00
parent 1ba25c5569
commit d6279bfff8
2 changed files with 3 additions and 1 deletions

View File

@ -62,7 +62,9 @@ CV__DNN_EXPERIMENTAL_NS_BEGIN
// this option is useful to run valgrind memory errors detection // this option is useful to run valgrind memory errors detection
static bool DNN_DISABLE_MEMORY_OPTIMIZATIONS = utils::getConfigurationParameterBool("OPENCV_DNN_DISABLE_MEMORY_OPTIMIZATIONS", false); static bool DNN_DISABLE_MEMORY_OPTIMIZATIONS = utils::getConfigurationParameterBool("OPENCV_DNN_DISABLE_MEMORY_OPTIMIZATIONS", false);
#ifdef HAVE_OPENCL
static bool DNN_OPENCL_ALLOW_ALL_DEVICES = utils::getConfigurationParameterBool("OPENCV_DNN_OPENCL_ALLOW_ALL_DEVICES", false); static bool DNN_OPENCL_ALLOW_ALL_DEVICES = utils::getConfigurationParameterBool("OPENCV_DNN_OPENCL_ALLOW_ALL_DEVICES", false);
#endif
using std::vector; using std::vector;
using std::map; using std::map;

View File

@ -661,7 +661,7 @@ void MultiBandBlender::blend(InputOutputArray dst, InputOutputArray dst_mask)
} }
// Set destination Mats to 0 so new image can be blended // Set destination Mats to 0 so new image can be blended
for (size_t i = 0; i < num_bands_ + 1; ++i) for (size_t i = 0; i < (size_t)(num_bands_ + 1); ++i)
{ {
gpu_dst_band_weights_[i].setTo(0); gpu_dst_band_weights_[i].setTo(0);
gpu_dst_pyr_laplace_[i].setTo(Scalar::all(0)); gpu_dst_pyr_laplace_[i].setTo(Scalar::all(0));