Commit 17c6b4d3 authored by Elena Gvozdeva's avatar Elena Gvozdeva

fixed warnings

parent 0edd0aaf
...@@ -371,7 +371,7 @@ protected: ...@@ -371,7 +371,7 @@ protected:
String name_; String name_;
bool ocl_getBackgroundImage(OutputArray backgroundImage) const; bool ocl_getBackgroundImage(OutputArray backgroundImage) const;
bool ocl_apply(InputArray _image, OutputArray _fgmask, bool needToInitialize, double learningRate=-1); bool ocl_apply(InputArray _image, OutputArray _fgmask, double learningRate=-1);
}; };
struct GaussBGStatModel2Params struct GaussBGStatModel2Params
...@@ -736,7 +736,7 @@ public: ...@@ -736,7 +736,7 @@ public:
uchar shadowVal; uchar shadowVal;
}; };
bool BackgroundSubtractorMOG2Impl::ocl_apply(InputArray _image, OutputArray _fgmask, bool needToInitialize, double learningRate) bool BackgroundSubtractorMOG2Impl::ocl_apply(InputArray _image, OutputArray _fgmask, double learningRate)
{ {
++nframes; ++nframes;
learningRate = learningRate >= 0 && nframes > 1 ? learningRate : 1./std::min( 2*nframes, history ); learningRate = learningRate >= 0 && nframes > 1 ? learningRate : 1./std::min( 2*nframes, history );
...@@ -746,7 +746,7 @@ bool BackgroundSubtractorMOG2Impl::ocl_apply(InputArray _image, OutputArray _fgm ...@@ -746,7 +746,7 @@ bool BackgroundSubtractorMOG2Impl::ocl_apply(InputArray _image, OutputArray _fgm
fgmask.setTo(cv::Scalar::all(1)); fgmask.setTo(cv::Scalar::all(1));
const float alpha1 = 1.0f - learningRate; const double alpha1 = 1.0f - learningRate;
int detectShadows_flag = 0; int detectShadows_flag = 0;
if(bShadowDetection) if(bShadowDetection)
...@@ -800,7 +800,7 @@ void BackgroundSubtractorMOG2Impl::apply(InputArray _image, OutputArray _fgmask, ...@@ -800,7 +800,7 @@ void BackgroundSubtractorMOG2Impl::apply(InputArray _image, OutputArray _fgmask,
if (opencl_ON) if (opencl_ON)
{ {
if (ocl_apply(_image,_fgmask, needToInitialize, learningRate)) if (ocl_apply(_image, _fgmask, learningRate))
return; return;
else else
initialize(_image.size(), _image.type()); initialize(_image.size(), _image.type());
...@@ -850,7 +850,7 @@ void BackgroundSubtractorMOG2Impl::getBackgroundImage(OutputArray backgroundImag ...@@ -850,7 +850,7 @@ void BackgroundSubtractorMOG2Impl::getBackgroundImage(OutputArray backgroundImag
{ {
if (opencl_ON) if (opencl_ON)
{ {
if (ocl_getBackgroundImage(backgroundImage)); if (ocl_getBackgroundImage(backgroundImage))
return; return;
opencl_ON = false; opencl_ON = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment