potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin
2018-08-07 20:09:27 +03:00
parent 053259fd92 9f2edc1135
commit 4eb2966559
80 changed files with 1272 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/features2d/doc/read_file_nondiff32.pl
+1 -1
View File
@@ -131,7 +131,7 @@ my $success_structured;
}
close $in2 or die "Can't close $filein: $!";
}
#find next else and interprete it
#find next else and interpret it
open(my $in3, "<", $filein) or die "Can't open $filein: $!";
$i3=1;
$ifcount3=0;
modules/features2d/doc/read_file_score32.pl
+1 -1
View File
@@ -119,7 +119,7 @@ my $is_a_corner;
}
close $in2 or die "Can't close $filein: $!";
}
#find next else and interprete it
#find next else and interpret it
open(my $in3, "<", $filein) or die "Can't open $filein: $!";
$i3=1;
$ifcount3=0;