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

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

This commit is contained in:
Alexander Alekhin
2020-04-13 20:00:12 +00:00
78 changed files with 192 additions and 53 deletions
Vendored Executable → Regular
View File
+1 -1
View File
@@ -63,7 +63,7 @@ Attribute::~Attribute () {}
namespace {
struct NameCompare: std::binary_function <const char *, const char *, bool>
struct NameCompare
{
bool
operator () (const char *x, const char *y) const
Vendored Executable → Regular
View File
View File
View File
View File