1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00

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

This commit is contained in:
Alexander Alekhin
2018-10-02 03:21:47 +00:00
committed by Alexander Alekhin
22 changed files with 182 additions and 68 deletions
+2
View File
@@ -136,6 +136,8 @@ void HOGDescriptor::setSVMDetector(InputArray _svmDetector)
bool HOGDescriptor::read(FileNode& obj)
{
CV_Assert(!obj["winSize"].empty());
if( !obj.isMap() )
return false;
FileNodeIterator it = obj["winSize"].begin();