From 1033f2b1bdfd32ce26de8c5190361a0d714b843e Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Fri, 15 Dec 2017 17:28:38 +0300 Subject: [PATCH] Fixed 3 issues found by static analysis --- modules/dnn/src/dnn.cpp | 2 ++ modules/dnn/src/layers/convolution_layer.cpp | 1 + modules/imgproc/src/smooth.cpp | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/dnn/src/dnn.cpp b/modules/dnn/src/dnn.cpp index d0ddd02..b9cb154 100644 --- a/modules/dnn/src/dnn.cpp +++ b/modules/dnn/src/dnn.cpp @@ -655,6 +655,8 @@ struct Net::Impl fusion = true; preferableBackend = DNN_BACKEND_DEFAULT; preferableTarget = DNN_TARGET_CPU; + blobManager.setPreferableBackend(DNN_BACKEND_DEFAULT); + blobManager.setPreferableTarget(DNN_TARGET_CPU); } Ptr netInputLayer; diff --git a/modules/dnn/src/layers/convolution_layer.cpp b/modules/dnn/src/layers/convolution_layer.cpp index d34ee98..f650afa 100644 --- a/modules/dnn/src/layers/convolution_layer.cpp +++ b/modules/dnn/src/layers/convolution_layer.cpp @@ -783,6 +783,7 @@ public: if( IS_POWER_LAYER(activ) ) { Ptr activ_power = activ.dynamicCast(); + CV_Assert(activ_power); a = activ_power->scale; b = activ_power->shift; } diff --git a/modules/imgproc/src/smooth.cpp b/modules/imgproc/src/smooth.cpp index afe45af..d55c06b 100644 --- a/modules/imgproc/src/smooth.cpp +++ b/modules/imgproc/src/smooth.cpp @@ -1844,7 +1844,7 @@ static bool ocl_GaussianBlur_8UC1(InputArray _src, OutputArray _dst, Size ksize, const char * const borderMap[] = { "BORDER_CONSTANT", "BORDER_REPLICATE", "BORDER_REFLECT", 0, "BORDER_REFLECT_101" }; char build_opts[1024]; - sprintf(build_opts, "-D %s %s%s", borderMap[borderType], + sprintf(build_opts, "-D %s %s%s", borderMap[borderType & ~BORDER_ISOLATED], ocl::kernelToStr(kernelX, CV_32F, "KERNEL_MATRIX_X").c_str(), ocl::kernelToStr(kernelY, CV_32F, "KERNEL_MATRIX_Y").c_str()); -- 2.7.4