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

2020-12-04 18:25:32 +00:00
parent 22d64ae08f 12a36b5a94
commit 6fdb7aee84
51 changed files with 2880 additions and 112 deletions
@@ -535,7 +535,8 @@ protected:
            img->copyTo(sub);
            shift += img->size().height + 1;
        }
-        //imwrite("/tmp/all_fonts.png", result);
+        if (cvtest::debugLevel > 0)
+            imwrite("all_fonts.png", result);
    }
 };