Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2021-06-03 16:23:36 +00:00
parent 0e8431d17b c34445a496
commit 3e513ee6ab
48 changed files with 1176 additions and 713 deletions
@@ -120,6 +120,12 @@ void HOGDescriptor::setSVMDetector(InputArray _svmDetector)
    _svmDetector.getMat().convertTo(svmDetector, CV_32F);
    CV_Assert(checkDetectorSize());

+    if (_svmDetector.empty())
+    {
+        oclSvmDetector = UMat();
+        return;
+    }
+
    Mat detector_reordered(1, (int)svmDetector.size(), CV_32FC1);

    size_t block_hist_size = getBlockHistogramSize(blockSize, cellSize, nbins);