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

2018-09-28 12:48:51 +03:00
parent 29e88e50ff 4b895a4d1f
commit a8b0db4e5d
77 changed files with 586 additions and 443 deletions
@@ -216,7 +216,7 @@ void HOGDescriptor::copyTo(HOGDescriptor& c) const
    c.histogramNormType = histogramNormType;
    c.L2HysThreshold = L2HysThreshold;
    c.gammaCorrection = gammaCorrection;
-    c.svmDetector = svmDetector;
+    c.setSVMDetector(svmDetector);
    c.nlevels = nlevels;
    c.signedGradient = signedGradient;
 }