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

2019-11-04 09:58:29 +00:00
parent 0ca5f68d72 53139e6ebe
commit 0d7f770996
18 changed files with 1360 additions and 1016 deletions
@@ -73,7 +73,7 @@ struct PyOpenCV_Converter< ${cname} >
            return true;
        }
        ${mappable_code}
-        failmsg("Expected ${cname} for argument '%%s'", name);
+        failmsg("Expected ${cname} for argument '%s'", name);
        return false;
    }
 };