mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-10 19:24:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10320 from mshabunin:static-analysis-1

Browse Source
This commit is contained in:
Alexander Alekhin 2017-12-15 16:53:34 +00:00
commit e728ffd5bf
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/dnn/src/dnn.cpp
View File

@ -655,6 +655,8 @@ struct Net::Impl
fusion = true; fusion = true;
preferableBackend = DNN_BACKEND_DEFAULT; preferableBackend = DNN_BACKEND_DEFAULT;
preferableTarget = DNN_TARGET_CPU; preferableTarget = DNN_TARGET_CPU;
blobManager.setPreferableBackend(DNN_BACKEND_DEFAULT);
blobManager.setPreferableTarget(DNN_TARGET_CPU);
} }
Ptr<DataLayer> netInputLayer; Ptr<DataLayer> netInputLayer;

1
modules/dnn/src/layers/convolution_layer.cpp
View File

@ -783,6 +783,7 @@ public:
if( IS_POWER_LAYER(activ) ) if( IS_POWER_LAYER(activ) )
{ {
Ptr<PowerLayer> activ_power = activ.dynamicCast<PowerLayer>(); Ptr<PowerLayer> activ_power = activ.dynamicCast<PowerLayer>();
CV_Assert(activ_power);
a = activ_power->scale; a = activ_power->scale;
b = activ_power->shift; b = activ_power->shift;
} }

2
modules/imgproc/src/smooth.cpp
View File

@ -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" }; const char * const borderMap[] = { "BORDER_CONSTANT", "BORDER_REPLICATE", "BORDER_REFLECT", 0, "BORDER_REFLECT_101" };
char build_opts[1024]; 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(kernelX, CV_32F, "KERNEL_MATRIX_X").c_str(),
ocl::kernelToStr(kernelY, CV_32F, "KERNEL_MATRIX_Y").c_str()); ocl::kernelToStr(kernelY, CV_32F, "KERNEL_MATRIX_Y").c_str());