Merge branch 4.x

Author: asmorkalov

modules/cudaimgproc/src/histogram.cpp

@@ -553,24 +553,6 @@ namespace
     };
 }
 
-class OldNppStreamHandlerForEvenLevels
-{
-public:
-    explicit OldNppStreamHandlerForEvenLevels(Stream& newStream)
-    {
-        oldStream = nppGetStream();
-        nppSafeSetStream(oldStream, StreamAccessor::getStream(newStream));
-    }
-
-    ~OldNppStreamHandlerForEvenLevels()
-    {
-        nppSafeSetStream(nppGetStream(), oldStream);
-    }
-
-private:
-    cudaStream_t oldStream;
-};
-
 void cv::cuda::evenLevels(OutputArray _levels, int nLevels, int lowerLevel, int upperLevel, Stream& stream)
 {
     const int kind = _levels.kind();
@@ -583,9 +565,6 @@ void cv::cuda::evenLevels(OutputArray _levels, int nLevels, int lowerLevel, int
     else
         host_levels = _levels.getMat();
 
-    // Update to use NppStreamHandler when nppiEvenLevelsHost_32s_Ctx is included in nppist.lib and libnppist.so
-    OldNppStreamHandlerForEvenLevels h(stream);
-
     nppSafeCall( nppiEvenLevelsHost_32s(host_levels.ptr<Npp32s>(), nLevels, lowerLevel, upperLevel) );
 
     if (kind == _InputArray::CUDA_GPU_MAT)

modules/xfeatures2d/include/opencv2/xfeatures2d.hpp

@@ -1213,6 +1213,8 @@ class CV_EXPORTS_W TBMR : public AffineFeature2D
     CV_WRAP virtual float getScaleFactor() const = 0;
     CV_WRAP virtual void setNScales(int n_scales) = 0;
     CV_WRAP virtual int getNScales() const = 0;
+
+    CV_WRAP String getDefaultName() const CV_OVERRIDE;
 };
 
 /** @brief Class implementing the BRISK keypoint detector and descriptor extractor, described in @cite LCS11 .

modules/xfeatures2d/src/tbmr.cpp

@@ -573,6 +573,11 @@ void TBMR_Impl::detectAndCompute(
                           useProvidedKeypoints);
 }
 
+String TBMR::getDefaultName() const
+{
+    return (Feature2D::getDefaultName() + ".TBMR");
+}
+
 Ptr<TBMR> TBMR::create(int _min_area, float _max_area_relative, float _scale,
                        int _n_scale)
 {
@@ -581,4 +586,4 @@ Ptr<TBMR> TBMR::create(int _min_area, float _max_area_relative, float _scale,
 }
 
 } // namespace xfeatures2d
-} // namespace cv
+} // namespace cv

modules/ximgproc/src/find_ellipses.cpp

@@ -1218,9 +1218,10 @@ void EllipseDetectorImpl::getTriplets413(VVP &pi, VVP &pj, VVP &pk,
     }
 }
 
-void EllipseDetectorImpl::preProcessing(Mat1b &image, Mat1b &dp, Mat1b &dn) {
+void EllipseDetectorImpl::preProcessing(Mat1b &src, Mat1b &dp, Mat1b &dn) {
     // smooth image
-    GaussianBlur(image, image, _kernelSize, _sigma);
+    Mat image;
+    GaussianBlur(src, image, _kernelSize, _sigma);
 
     // temp variables
     Mat1b edges;// edge mask